Download as
Browse Code »

Commit 874e1575e3683ffe953ee26565933776d0026c91

Authored by Rodrigo Souto
2 parents 1b2a4981 f36e4843
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

Merge branch 'merge-requests/344' into stable 

g wrong happens with comment creation

Conflicts:
	public/javascripts/comment_form.js
Showing 2 changed files with 7 additions and 8 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @874e157
@@ -100,9 +100,9 @@ class ContentViewerController < ApplicationController @@ -100,9 +100,9 @@ class ContentViewerController < ApplicationController
100 end 100 end
101 101
102 @comments = @page.comments.without_spam 102 @comments = @page.comments.without_spam
  103 + @comments = @plugins.filter(:unavailable_comments, @comments)
103 @comments_count = @comments.count 104 @comments_count = @comments.count
104 - @comments = @plugins.filter(:unavailable_comments, @comments.without_reply)  
105 - @comments = @comments.paginate(:per_page => per_page, :page => params[:comment_page] ) 105 + @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
106 106
107 if params[:slideshow] 107 if params[:slideshow]
108 render :action => 'slideshow', :layout => 'slideshow' 108 render :action => 'slideshow', :layout => 'slideshow'
public/javascripts/comment_form.js
  Diff comments   View file @874e157
@@ -54,7 +54,7 @@ function save_comment(button) { @@ -54,7 +54,7 @@ function save_comment(button) {
54 $('#'+ data.render_target).replaceWith(data.html); 54 $('#'+ data.render_target).replaceWith(data.html);
55 $('#' + data.render_target).effect("highlight", {}, 3000); 55 $('#' + data.render_target).effect("highlight", {}, 3000);
56 $.colorbox.close(); 56 $.colorbox.close();
57 - update_comment_count(); 57 + increment_comment_count(comment_div);
58 } else { 58 } else {
59 //New comment of article 59 //New comment of article
60 comment_div.find('.article-comments-list').append(data.html); 60 comment_div.find('.article-comments-list').append(data.html);
@@ -65,7 +65,7 @@ function save_comment(button) { @@ -65,7 +65,7 @@ function save_comment(button) {
65 65
66 page_comment_form.find('.errorExplanation').remove(); 66 page_comment_form.find('.errorExplanation').remove();
67 $.colorbox.close(); 67 $.colorbox.close();
68 - update_comment_count(); 68 + increment_comment_count(comment_div);
69 } 69 }
70 70
71 if(jQuery('#recaptcha_response_field').val()){ 71 if(jQuery('#recaptcha_response_field').val()){
@@ -83,12 +83,11 @@ function save_comment(button) { @@ -83,12 +83,11 @@ function save_comment(button) {
83 }, 'json'); 83 }, 'json');
84 } 84 }
85 85
86 -function update_comment_count() { 86 +function increment_comment_count(comment_div) {
87 comment_div.find('.comment-count').add('#article-header .comment-count').each(function() { 87 comment_div.find('.comment-count').add('#article-header .comment-count').each(function() {
88 - var count = parseInt($(this).html());  
89 - update_comment_count($(this), count + 1); 88 + var count = parseInt(jQuery(this).html());
  89 + update_comment_count(jQuery(this), count + 1);
90 }); 90 });
91 -  
92 } 91 }
93 92
94 function show_display_comment_button() { 93 function show_display_comment_button() {