Download as
Browse Code »

Commit bbae98625f4013084ba5059e7837d0e49535cea5

Authored by Antonio Terceiro
1 parent 403fa5ef
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

ActionItem628: linking directly to the URL where pending tasks can be 

solved.
Showing 4 changed files with 7 additions and 3 deletions   Show diff stats
app/models/add_friend.rb
  Diff comments   View file @bbae986
... ... @@ -27,7 +27,7 @@ class AddFriend < Task
27 27  
28 28 def target_notification_message
29 29 description + "\n\n" +
30   - _('You need to login to %{system} in order to accept %{requestor} as your friend. You can use the address below to do that.') % { :system => target.environment.name, :requestor => requestor.name }
  30 + _('You need to login to %{system} in order to accept %{requestor} as your friend.') % { :system => target.environment.name, :requestor => requestor.name }
31 31 end
32 32  
33 33 end
... ...
app/models/approve_article.rb
  Diff comments   View file @bbae986
... ... @@ -41,7 +41,7 @@ class ApproveArticle < Task
41 41  
42 42 def target_notification_message
43 43 description + "\n\n" +
44   - _('You need to login on %{system} in order to approve or reject this article. You can use the address below to do that.') % { :system => target.environment.name }
  44 + _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
45 45 end
46 46  
47 47 end
... ...
app/models/task_mailer.rb
  Diff comments   View file @bbae986
... ... @@ -20,7 +20,8 @@ class TaskMailer < ActionMailer::Base
20 20 :target => task.target.name,
21 21 :message => msg,
22 22 :environment => task.requestor.environment.name,
23   - :url => url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
  23 + :url => url_for(:host => task.requestor.environment.default_hostname, :controller => 'home'),
  24 + :tasks_url => url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
24 25 end
25 26  
26 27 protected
... ...
app/views/task_mailer/target_notification.rhtml
  Diff comments   View file @bbae986
... ... @@ -2,6 +2,9 @@
2 2  
3 3 <%= word_wrap(@message) %>
4 4  
  5 +<%= word_wrap(_('Access the address below to see this and other pending actions that need your attention:')) %>
  6 +<%= @tasks_url %>
  7 +
5 8 --
6 9 <%= @environment %>
7 10 <%= @url %>
... ...