Download as
Browse Code »

Commit e7b93cf4cf01880aa94c7e6f38d9faffda1f4c40

Authored by Antonio Terceiro
1 parent a89d2b9e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Removing in-house touch method for ActiveRecord 

The touch method provided by Rails 2.3.5 actually has a different
semantics, and since it was only used in two places, it's better to
inline the semantics we wanted.
Showing 3 changed files with 2 additions and 15 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @e7b93cf
@@ -105,7 +105,7 @@ class ContentViewerController < ApplicationController @@ -105,7 +105,7 @@ class ContentViewerController < ApplicationController
105 @comment.author = user if logged_in? 105 @comment.author = user if logged_in?
106 @comment.article = @page 106 @comment.article = @page
107 if @comment.save 107 if @comment.save
108 - @page.touch 108 + @page.update_attribute(:updated_at, Time.now)
109 @comment = nil # clear the comment form 109 @comment = nil # clear the comment form
110 redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view] 110 redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
111 else 111 else
app/sweepers/article_sweeper.rb
  Diff comments   View file @e7b93cf
@@ -15,7 +15,7 @@ protected @@ -15,7 +15,7 @@ protected
15 def expire_caches(article) 15 def expire_caches(article)
16 article.hierarchy.each do |a| 16 article.hierarchy.each do |a|
17 if a != article 17 if a != article
18 - a.touch 18 + a.update_attribute(:updated_at, Time.now)
19 end 19 end
20 end 20 end
21 blocks = article.profile.blocks 21 blocks = article.profile.blocks
vendor/plugins/touch/init.rb
View file @a89d2b9
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -if ActiveRecord::Base.instance_methods.include?("touch") && Class.const_defined?('TOUCH_LOADED')  
2 - puts "W: ActiveRecord already provides a touch method, which means you must be using rails 2.3.3 or later."  
3 - puts "W: In this case the touch plugin could probably be removed"  
4 -end  
5 -TOUCH_LOADED = true  
6 -  
7 -module Touch  
8 - def touch  
9 - update_attribute(:updated_at, Time.now)  
10 - end  
11 -end  
12 -  
13 -ActiveRecord::Base.send(:include, Touch)