Download as
Browse Code »

Commit ae2baaf1a5df2d50724eca9cd8d3ebc68e62a9a9

Authored by Daniela Feitosa
2 parents 3cd6186e 99485877
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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,10 +116,11 @@ class ApproveArticle < Task
116 end 116 end
117 117
118 def task_cancelled_message 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 if !reject_explanation.blank? 120 if !reject_explanation.blank?
121 message += " " + _("Here is the reject explanation left by the administrator who rejected your article: \n\n%{reject_explanation}") % {:reject_explanation => reject_explanation} 121 message += " " + _("Here is the reject explanation left by the administrator who rejected your article: \n\n%{reject_explanation}") % {:reject_explanation => reject_explanation}
122 end 122 end
  123 + message
123 end 124 end
124 125
125 end 126 end
test/unit/approve_article_test.rb
  Diff comments   View file @ae2baaf
@@ -413,5 +413,14 @@ class ApproveArticleTest < ActiveSupport::TestCase @@ -413,5 +413,14 @@ class ApproveArticleTest < ActiveSupport::TestCase
413 end 413 end
414 end 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 end 426 end