Download as
Browse Code »

Commit d36492d689bf504d018a550f6e2eb73bd41602d8

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 59a30bcc
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

Display message if article is removed before approval 

If a person asks to publish an article in a community
and removes it before approval, is displayed a message

(ActionItem1343)
Showing 2 changed files with 42 additions and 17 deletions   Show diff stats
app/views/tasks/_approve_article.rhtml
  Diff comments   View file @d36492d
1 <h2><%= _('New article') %></h2> 1 <h2><%= _('New article') %></h2>
2 2
3 -<%= _('%s wants to publish content: %s.') %  
4 - [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),  
5 - content_tag('strong', link_to( task.name, task.article.url ) )] %>  
6 -  
7 <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %> 3 <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
8 4
9 - <div>  
10 - <%= radio_button_tag(:decision, 'finish', true, 5 + <% if task.article.nil? %>
  6 + <%= _('%s wanted to publish content but it was removed. It cannot be approved.') % content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ) %>
  7 + <%= hidden_field_tag(:decision, 'cancel') %>
  8 + <% else %>
  9 + <%= _('%s wants to publish content: %s.') %
  10 + [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
  11 + content_tag('strong', link_to( task.name, task.article.url ) )] %>
  12 +
  13 + <div>
  14 + <%= radio_button_tag(:decision, 'finish', true,
11 :id => "decision-finish-#{task.id}", 15 :id => "decision-finish-#{task.id}",
12 :onclick => "Element.show('group-for-friend-#{task.id}')") %> 16 :onclick => "Element.show('group-for-friend-#{task.id}')") %>
13 - <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label> 17 + <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
14 18
15 - &nbsp; &nbsp; 19 + &nbsp; &nbsp;
16 20
17 - <%= radio_button_tag(:decision, 'cancel', false,  
18 - :id => "decision-cancel-#{task.id}",  
19 - :onclick => "Element.hide('group-for-friend-#{task.id}')") %>  
20 - <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label> 21 + <%= radio_button_tag(:decision, 'cancel', false,
  22 + :id => "decision-cancel-#{task.id}",
  23 + :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
  24 + <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
21 25
22 - <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %> 26 + <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
23 27
24 - <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>  
25 - <%= labelled_form_field( _('Highlight this article'), f.check_box(:highlighted)) %>  
26 - <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %> 28 + <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
  29 + <%= labelled_form_field( _('Highlight this article'), f.check_box(:highlighted)) %>
  30 + <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
27 31
28 - </div> 32 + </div>
  33 + <% end %>
29 34
30 <% button_bar do %> 35 <% button_bar do %>
31 <%= submit_button(:ok, _('Ok!')) %> 36 <%= submit_button(:ok, _('Ok!')) %>
features/publish_article.feature
  Diff comments   View file @d36492d
@@ -113,3 +113,23 @@ Feature: publish article @@ -113,3 +113,23 @@ Feature: publish article
113 When I press "Ok!" 113 When I press "Ok!"
114 Then I should see "Validation failed: Slug (the code generated from the article name) is already being used by another article." 114 Then I should see "Validation failed: Slug (the code generated from the article name) is already being used by another article."
115 115
  116 + Scenario: ask to publish an article and remove it before approval
  117 + Given I am logged in as "joaosilva"
  118 + And "Joao Silva" is admin of "Sample Community"
  119 + And I am on Sample Community's control panel
  120 + And I follow "Community Info and settings"
  121 + And I choose "profile_data_moderated_articles_true"
  122 + And I press "Save"
  123 + And I am on Joao Silva's control panel
  124 + And I follow "Manage Content"
  125 + And I follow "Spread"
  126 + And I check "Sample Community"
  127 + And I press "Publish"
  128 + And "joaosilva" has no articles
  129 + And I am on Sample Community's control panel
  130 + When I follow "Tasks"
  131 + Then I should see "Joao Silva wanted to publish an article but it was removed. It cannot be approved."
  132 + And I press "Ok!"
  133 + And I am on Sample Community's control panel
  134 + When I follow "Tasks"
  135 + Then I should not see "Joao Silva wanted to publish an article but it was removed. It cannot be approved."