Download as
Browse Code »

Commit ae2baaf1a5df2d50724eca9cd8d3ebc68e62a9a9

Authored by Daniela Feitosa
2 parents 3cd6186e 99485877
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

Merge commit 'refs/merge-requests/170' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/170
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/models/approve_article.rb
  Diff comments   View file @ae2baaf
... ... @@ -116,10 +116,11 @@ class ApproveArticle < Task
116 116 end
117 117  
118 118 def task_cancelled_message
119   - message = _('Your request for publishing the article "{article}" was rejected.')
  119 + message = _('Your request for publishing the article "%{article}" was rejected.') % {:article => name}
120 120 if !reject_explanation.blank?
121 121 message += " " + _("Here is the reject explanation left by the administrator who rejected your article: \n\n%{reject_explanation}") % {:reject_explanation => reject_explanation}
122 122 end
  123 + message
123 124 end
124 125  
125 126 end
... ...
test/unit/approve_article_test.rb
  Diff comments   View file @ae2baaf
... ... @@ -413,5 +413,14 @@ class ApproveArticleTest < ActiveSupport::TestCase
413 413 end
414 414 end
415 415  
  416 + should 'return reject message even without reject explanation' do
  417 + task = ApproveArticle.new(:name => 'My Article')
  418 + assert_not_nil task.task_cancelled_message
  419 + end
  420 +
  421 + should 'show the name of the article in the reject message' do
  422 + task = ApproveArticle.new(:name => 'My Article')
  423 + assert_match /My Article/, task.task_cancelled_message
  424 + end
416 425  
417 426 end
... ...