Download as
Browse Code »

Commit 1c7ee398e35fe35ded816d5343f1769cf56b2906

Authored by MoisesMachado
1 parent 640e6dbe
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem371: added a button to send requests to friends 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2434 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 17 additions and 8 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @1c7ee39
@@ -23,7 +23,9 @@ class TasksController < MyProfileController @@ -23,7 +23,9 @@ class TasksController < MyProfileController
23 end 23 end
24 24
25 def new 25 def new
  26 + target = profile.friends.find_by_id(params[:target_id])
26 @ticket = Ticket.new(params[:ticket]) 27 @ticket = Ticket.new(params[:ticket])
  28 + @ticket.target = target
27 @ticket.requestor = profile 29 @ticket.requestor = profile
28 if request.post? 30 if request.post?
29 if @ticket.save 31 if @ticket.save
app/views/blocks/profile_info_actions/person.rhtml
  Diff comments   View file @1c7ee39
1 <ul> 1 <ul>
2 - <%if logged_in? && (user != profile) && (! user.friends.include?(profile)) && !user.already_request_friendship?(profile) %>  
3 - <li><%= link_to content_tag('span', __('Add friend')), { :profile => user.identifier, :controller => 'friends', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li> 2 + <%if logged_in? && (user != profile) %>
  3 + <%if user.friends.include?(profile) %>
  4 + <li> <%= link_to content_tag('span', _('Send request')), {:profile => user.identifier, :controller => 'tasks', :action => 'new', :target_id => profile.id}, :class => 'button with-text icon-menu-mail' %> </li>
  5 + <% elsif !user.already_request_friendship?(profile) %>
  6 + <li><%= link_to content_tag('span', __('Add friend')), { :profile => user.identifier, :controller => 'friends', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
  7 + <% end %>
4 <% end %> 8 <% end %>
5 </ul> 9 </ul>
app/views/tasks/index.rhtml
  Diff comments   View file @1c7ee39
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 14
15 <% button_bar do %> 15 <% button_bar do %>
16 <%= button(:edit, _('View processed tasks'), :action => 'processed') %> 16 <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
17 - <%= button(:edit, _('View my requested tasks'), :action => 'list_requested') %>  
18 - <%= button(:new, _('Create task'), :action => 'new') %> 17 + <%= button(:edit, _('View my requests'), :action => 'list_requested') %>
  18 + <%= button('menu-mail', _('Send request'), :action => 'new') %>
19 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %> 19 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
20 <% end %> 20 <% end %>
app/views/tasks/new.rhtml
  Diff comments   View file @1c7ee39
  1 +<h1><%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %></h1>
  2 +
  3 +<%# FIXME: put style in css %>
1 <% labelled_form_for :ticket, @ticket do |f| %> 4 <% labelled_form_for :ticket, @ticket do |f| %>
2 - <%= f.text_field :title %>  
3 - <%= display_form_field( _('Owner: '), f.select(:target_id, profile.friends.map{|p|[p.name, p.id]})) %>  
4 - <%= f.text_area :description %> 5 + <%= display_form_field( _('To: '), f.select(:target_id, profile.friends.map{|p|[p.name, p.id]})) unless @ticket.target %>
  6 + <%= f.text_field :title, :style => 'width:80%;' %>
  7 + <%= f.text_area :description, :style => 'height:200px; width:80%;' %>
5 8
6 <% button_bar do %> 9 <% button_bar do %>
7 - <%= submit_button('save', _('Create'), :cancel => {:action => 'index'}) %> 10 + <%= submit_button(:ok, _('Send'), :cancel => {:action => 'index'}) %>
8 <% end %> 11 <% end %>
9 <% end %> 12 <% end %>