Download as
Browse Code »

Commit d8964fab94553b158739470bfc7c2702cf566026

Authored by AntonioTerceiro
1 parent 1b3c8fbc
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem36: showing/hiding field for group 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1491 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 10 additions and 6 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @d8964fa
@@ -13,7 +13,7 @@ class TasksController < MyProfileController @@ -13,7 +13,7 @@ class TasksController < MyProfileController
13 def close 13 def close
14 decision = params[:decision] 14 decision = params[:decision]
15 if request.post? && VALID_DECISIONS.include?(decision) && params[:id] 15 if request.post? && VALID_DECISIONS.include?(decision) && params[:id]
16 - task = Task.find(params[:id]) 16 + task = profile.tasks.find(params[:id])
17 task.update_attributes!(params[:task]) 17 task.update_attributes!(params[:task])
18 task.send(decision) 18 task.send(decision)
19 end 19 end
app/views/tasks/_add_friend.rhtml
  Diff comments   View file @d8964fa
@@ -4,16 +4,20 @@ @@ -4,16 +4,20 @@
4 <%= _('%s wants to connect to you as a friend.') % task.requestor.name %> 4 <%= _('%s wants to connect to you as a friend.') % task.requestor.name %>
5 </p> 5 </p>
6 6
7 -<% labelled_form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %> 7 +<% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
8 8
9 <div> 9 <div>
10 - <%= radio_button_tag(:decision, 'finish', true) %>  
11 - <%= _('Accept') %> 10 + <%= radio_button_tag(:decision, 'finish', true, :id => "decision-finish-#{task.id}", :onclick => "Element.show('group-for-person-#{task.id}')") %>
  11 + <%= _('Accept') %>
  12 +
  13 + <% content_tag('div', :id => "group-for-person-#{task.id}") do %>
  14 + <%= labelled_form_field(_('Add %s to the following group:') % task.requestor.name, f.text_field(:group_for_person)) %>
  15 + <% end %>
12 </div> 16 </div>
13 17
14 <div> 18 <div>
15 - <%= radio_button_tag(:decision, 'cancel', false) %>  
16 - <%= _('Ignore') %> 19 + <%= radio_button_tag(:decision, 'cancel', false, :id => "decision-cancel-#{task.id}", :onclick => "Element.hide('group-for-person-#{task.id}')") %>
  20 + <%= _('Ignore') %>
17 </div> 21 </div>
18 22
19 <% button_bar do %> 23 <% button_bar do %>