@@ -17,7 +17,7 @@ module Admin end def delete - @comment.destroy! + @comment.destroy expire_index expire_article(@comment.article) redirect url(:admin_comments) feather-comments/controllers/admin/comments.rb @@ -37,7 +37,7 @@ module Admin end def delete - @ping_service.destroy! + @ping_service.destroy redirect url(:admin_ping_services) end feather-pings/controllers/ping_services.rb @@ -37,7 +37,7 @@ module Admin end def delete - @redirect.destroy! + @redirect.destroy redirect url(:admin_redirects) end feather-redirects/controllers/redirects.rb @@ -35,7 +35,7 @@ module Admin end def delete - @release.destroy! + @release.destroy redirect url(:admin_releases) end feather-repo/controllers/admin/releases.rb @@ -9,7 +9,7 @@ new Form.Element.Observer('search-text', 1, function(element, value) {new Ajax.Updater( 'search-results', - 'http://<%= request.env['HTTP_HOST'] %>/search', + '/search', {asynchronous:true, evalScripts:true, onComplete:function(request) {Element.hide('search-spinner')}, feather-search/views/sidebar/_search_bar.html.erb @@ -37,7 +37,7 @@ module Admin end def delete - @sidebar_group.destroy! + @sidebar_group.destroy expire_all_pages redirect url(:admin_sidebar_groups) end feather-sidebar/controllers/sidebar_groups.rb @@ -37,7 +37,7 @@ module Admin end def delete - @snippet.destroy! + @snippet.destroy expire_all_pages redirect url(:admin_snippets) end feather-snippets/controllers/snippets.rb @@ -37,7 +37,7 @@ module Admin end def delete - @style.destroy! + @style.destroy expire_all_pages redirect url(:admin_styles) end feather-styles/controllers/styles.rb @@ -8,7 +8,7 @@ class Article def create_tags return if @tag_list.nil? || @tag_list.empty? # Wax all the existing taggings - self.taggings.each {|t| t.destroy! } + self.taggings.each {|t| t.destroy } @tag_list.split(",").each do |t| unless t.empty? tag = Tag.find_or_create(:name => t.strip.downcase) feather-tagging/lib/article.rb @@ -29,7 +29,7 @@ module Admin end def delete - Theme.get(params[:id]).destroy! + Theme.get(params[:id]).destroy redirect url(:admin_themes) end end feather-themes/controllers/admin/themes.rb @@ -18,7 +18,7 @@ class Theme name end - def destroy! + def destroy FileUtils.rm_rf(path) end feather-themes/models/theme.rb @@ -9,7 +9,7 @@ module Admin end def delete - @tweet.destroy! + @tweet.destroy expire_index redirect url(:admin_tweets) end feather-twitter/controllers/admin/tweets.rb @@ -19,12 +19,15 @@ module Admin @upload.url = (@upload.url[0...1] == "/" ? @upload.url : "/#{@upload.url}") @upload.url = (@upload.url[0...6] == "/files" ? @upload.url : "/files#{@upload.url}") # Create the directory - FileUtils.mkdir_p Merb.dir_for(:public) / File.dirname(@upload.url) + # FileUtils.mkdir_p Merb.dir_for(:public) / File.dirname(@upload.url) # If a file is present, set the size, content type, and then move the temporary file to the new uploads location unless params[:file].nil? || params[:file][:tempfile].nil? @upload.size = params[:file][:size] @upload.content_type = params[:file][:content_type] FileUtils.mv(params[:file][:tempfile].path, (Merb.dir_for(:public) / @upload.url)) + unless File.chmod(0644, @upload.url) == 0 + raise "Couldn't change permission on #{@upload_url}" + end end @upload.created_at = Time.now if @upload.save @@ -35,7 +38,7 @@ module Admin end def delete - @upload.destroy! + @upload.destroy # Delete the physical file File.delete(Merb.dir_for(:public) / @upload.url) redirect url(:admin_uploads) feather-uploads/controllers/admin/uploads.rb 009f732c47aaa6e39c48d3872a569f523f3049b1 Michael Leung blamemike@gmail.com http://github.com/edraper/feather-plugins/commit/019c87d0e432fa923e793b9a6e7faab7f338d6de 019c87d0e432fa923e793b9a6e7faab7f338d6de 2008-06-11T11:08:04-07:00 2008-06-11T11:08:04-07:00 Changed destroy! to destroy to be compatible with DM 0.9.1 cf17eed06ee4d323f5fe34356e58e39d1e24b1d3 Michael Leung blamemike@gmail.com