Download as
Browse Code »

Commit 602594d68e0dd29923adee391e6120570ee243fe

Authored by Daniela Feitosa
2 parents 5eb77a86 263c7bd1
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/9' of git://gitorious.org/noosfero/noosfero into merge-requests/9

Showing 2 changed files with 31 additions and 3 deletions   Show diff stats
app/models/approve_article.rb
  Diff comments   View file @602594d
@@ -77,6 +77,10 @@ class ApproveArticle < Task @@ -77,6 +77,10 @@ class ApproveArticle < Task
77 true 77 true
78 end 78 end
79 79
  80 + def reject_details
  81 + true
  82 + end
  83 +
80 def default_decision 84 def default_decision
81 if article 85 if article
82 'skip' 86 'skip'
@@ -107,4 +111,11 @@ class ApproveArticle < Task @@ -107,4 +111,11 @@ class ApproveArticle < Task
107 end 111 end
108 end 112 end
109 113
  114 + def task_cancelled_message
  115 + message = _('Your request for publishing the article "{article}" was rejected.')
  116 + if !reject_explanation.blank?
  117 + message += " " + _("Here is the reject explanation left by the administrator who rejected your article: \n\n%{reject_explanation}") % {:reject_explanation => reject_explanation}
  118 + end
  119 + end
  120 +
110 end 121 end
features/approve_article.feature
  Diff comments   View file @602594d
@@ -5,9 +5,9 @@ Feature: approve article @@ -5,9 +5,9 @@ Feature: approve article
5 5
6 Background: 6 Background:
7 Given the following users 7 Given the following users
8 - | login | name |  
9 - | joaosilva | Joao Silva |  
10 - | mariasilva | Maria Silva | 8 + | login | name | email |
  9 + | joaosilva | Joao Silva | joaosilva@example.com |
  10 + | mariasilva | Maria Silva | mariasilva@example.com |
11 And the following articles 11 And the following articles
12 | owner | name | body | homepage | 12 | owner | name | body | homepage |
13 | mariasilva | Sample Article | This is an article | true | 13 | mariasilva | Sample Article | This is an article | true |
@@ -34,3 +34,20 @@ Feature: approve article @@ -34,3 +34,20 @@ Feature: approve article
34 And I go to Sample Community's sitemap 34 And I go to Sample Community's sitemap
35 And I follow "Sample Article" 35 And I follow "Sample Article"
36 Then I should see "This is an article edited" 36 Then I should see "This is an article edited"
  37 +
  38 + @selenium
  39 + Scenario: reject an article with explanation
  40 + Given I am logged in as "mariasilva"
  41 + And I go to Maria Silva's cms
  42 + And I follow "Sample Article"
  43 + And I follow "Spread" and wait
  44 + And I check "Sample Community"
  45 + And I press "Spread this"
  46 + And I am logged in as "joaosilva"
  47 + And I go to Sample Community's control panel
  48 + And I follow "Process requests" and wait
  49 + And I choose "Reject"
  50 + And I fill in "Rejection explanation" with "This is not an appropriate article for this community."
  51 + And I press "Apply!"
  52 + When I go to Sample Community's sitemap
  53 + Then I should not see "Sample Article"