Download as
Browse Code »

Commit 44854faa1178acc339e0896f13f887d7afa9a5ce

Authored by MoisesMachado
1 parent 94481abd
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

ActionItem234: added a better interface to accept articles 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2454 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 43 additions and 0 deletions   Show diff stats
app/models/approve_article.rb
  Diff comments   View file @44854fa
1 class ApproveArticle < Task 1 class ApproveArticle < Task
2 serialize :data, Hash 2 serialize :data, Hash
3 3
  4 + def description
  5 + _('%s wants to publish %s') % [requestor.name, article.name]
  6 + end
  7 +
4 def data 8 def data
5 self[:data] ||= {} 9 self[:data] ||= {}
6 end 10 end
@@ -21,6 +25,14 @@ class ApproveArticle &lt; Task @@ -21,6 +25,14 @@ class ApproveArticle &lt; Task
21 data[:name] = value 25 data[:name] = value
22 end 26 end
23 27
  28 + def closing_statment
  29 + data[:closing_statment]
  30 + end
  31 +
  32 + def closing_statment= value
  33 + data[:closing_statment] = value
  34 + end
  35 +
24 def perform 36 def perform
25 PublishedArticle.create(:name => name, :profile => target, :reference_article => article) 37 PublishedArticle.create(:name => name, :profile => target, :reference_article => article)
26 end 38 end
app/views/tasks/_approve_article.rhtml 0 → 100644
  Diff comments   View file @44854fa
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
  1 +<h2><%= _('New article') %></h2>
  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| %>
  8 +
  9 + <div>
  10 + <%= radio_button_tag(:decision, 'finish', true,
  11 + :id => "decision-finish-#{task.id}",
  12 + :onclick => "Element.show('group-for-friend-#{task.id}')") %>
  13 + <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
  14 +
  15 + &nbsp; &nbsp;
  16 +
  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 +
  22 + <%= labelled_form_field _('Name for publishing'), f.text_field(:name) %>
  23 +
  24 + <%= labelled_form_field(_('Closing statment'), f.text_area(:closing_statment) ) %>
  25 +
  26 + </div>
  27 +
  28 + <% button_bar do %>
  29 + <%= submit_button(:ok, _('Ok!')) %>
  30 + <% end %>
  31 +<% end %>