Download as
Browse Code »

Commit b2ad753b2b0197b4ed5d1e34461dcfd2e236e9a9

Authored by Daniela Feitosa
1 parent f7418835
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

Allowing reply of scraps reply 

Fixing activities comments submit
Showing 4 changed files with 7 additions and 18 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @b2ad753
@@ -179,7 +179,7 @@ class ProfileController < PublicController @@ -179,7 +179,7 @@ class ProfileController < PublicController
179 @tab_action = params[:tab_action] 179 @tab_action = params[:tab_action]
180 @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.") 180 @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
181 @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil? 181 @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
182 - render :partial => 'leave_scrap' 182 + render :partial => 'profile_activities_list'
183 end 183 end
184 184
185 def leave_comment_on_activity 185 def leave_comment_on_activity
@@ -192,7 +192,7 @@ class ProfileController < PublicController @@ -192,7 +192,7 @@ class ProfileController < PublicController
192 @tab_action = params[:tab_action] 192 @tab_action = params[:tab_action]
193 @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.") 193 @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
194 @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil? 194 @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page]) if params[:not_load_scraps].nil?
195 - render :partial => 'leave_comment_on_activity' 195 + render :partial => 'profile_activities_list'
196 end 196 end
197 197
198 def view_more_scraps 198 def view_more_scraps
app/views/profile/_profile_activity.rhtml
  Diff comments   View file @b2ad753
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <hr /> 3 <hr />
4 4
5 <% if logged_in? && current_person.follows?(activity.user) %> 5 <% if logged_in? && current_person.follows?(activity.user) %>
6 - <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span> 6 + <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{activity.id}'],['#profile-wall-reply-#{activity.id}', '#profile-wall-reply-form-#{activity.id}']);$('reply_content_#{activity.id}').value='';$('reply_content_#{activity.id}').focus();$('activity_id_#{activity.id}').value='#{activity.id}';return false", :class => "profile-send-reply" %></span>
7 <% end %> 7 <% end %>
8 8
9 <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'> 9 <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
app/views/profile/_profile_comment_form.rhtml
  Diff comments   View file @b2ad753
1 <div id='profile-wall-reply-<%= activity.id%>'> 1 <div id='profile-wall-reply-<%= activity.id%>'>
2 <div id='profile-wall-reply-form-<%= activity.id%>'> 2 <div id='profile-wall-reply-form-<%= activity.id%>'>
3 <p class='profile-wall-reply'> 3 <p class='profile-wall-reply'>
4 - <% form_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %> 4 + <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities' do %>
5 <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress'} %> 5 <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress'} %>
6 <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %> 6 <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
7 <% end %> 7 <% end %>
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @b2ad753
@@ -10,8 +10,8 @@ @@ -10,8 +10,8 @@
10 <p class='profile-wall-text'><%= txt2html scrap.content %></p> 10 <p class='profile-wall-text'><%= txt2html scrap.content %></p>
11 <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p> 11 <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
12 <div class='profile-wall-actions'> 12 <div class='profile-wall-actions'>
13 - <% if logged_in? && current_person.follows?(scrap.sender) && scrap.root.nil? %>  
14 - <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span> 13 + <% if logged_in? && current_person.follows?(scrap.sender) %>
  14 + <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
15 <% end %> 15 <% end %>
16 <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %> 16 <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
17 <% end %> 17 <% end %>
@@ -34,17 +34,6 @@ @@ -34,17 +34,6 @@
34 </div> 34 </div>
35 <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div> 35 <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
36 </div> 36 </div>
37 - <div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>  
38 - <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>  
39 - <p class='profile-wall-reply'>  
40 - <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>  
41 - <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}", :cols => 50, :rows => 2, :class => 'submit-with-keypress' } %>  
42 - <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>  
43 - <%= hidden_field_tag 'receiver_id', scrap.sender.id %>  
44 - <% end %>  
45 - </p>  
46 - </div>  
47 - <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>  
48 - </div> 37 + <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
49 <hr /> 38 <hr />
50 </li> 39 </li>