Download as
Browse Code »

Commit a8b89acec18abc6fecc5513ae62bbeccfd27edec

Authored by Daniela Feitosa
1 parent 8ab42ad6
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Updating action when article is updated

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @a8b89ac
... ... @@ -2,7 +2,7 @@ require 'hpricot'
2 2  
3 3 class Article < ActiveRecord::Base
4 4  
5   - track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :id], :if => Proc.new { |a| a.is_trackable? && !a.image? }, :custom_target => :action_tracker_target
  5 + track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead], :if => Proc.new { |a| a.is_trackable? && !a.image? }
6 6  
7 7 # xss_terminate plugin can't sanitize array fields
8 8 before_save :sanitize_tag_list
... ... @@ -135,7 +135,8 @@ class Article &lt; ActiveRecord::Base
135 135  
136 136 after_update :update_creation_activity
137 137 def update_creation_activity
138   - #update article's activity
  138 + action = ActionTracker::Record.find(:first, :conditions => {:target_type => 'Article', :target_id => self.id})
  139 + action.touch
139 140 end
140 141  
141 142 # retrieves all articles belonging to the given +profile+ that are not
... ...
app/views/profile/_comment.rhtml
  Diff comments   View file @a8b89ac
... ... @@ -19,7 +19,7 @@
19 19 <%= txt2html comment.body %>
20 20 </div>
21 21 <div class="profile-activity-time">
22   - <%= show_time(comment.created_at) %>
  22 + <%= time_ago_as_sentence(comment.created_at) %>
23 23 </div>
24 24 </div>
25 25  
... ...