diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index ee880b1..0d5c99e 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -218,7 +218,10 @@ class ProfileController < PublicController def more_comments profile_filter = @profile.person? ? {:user_id => @profile} : {:target_id => @profile} - activity = ActionTracker::Record.where({:id => params[:activity]}.merge profile_filter).first + activity = ActionTracker::Record.where(:id => params[:activity]) + activity = activity.where(profile_filter) if !logged_in? || !current_person.follows?(@profile) + activity = activity.first + comments_count = activity.comments.count comment_page = (params[:comment_page] || 1).to_i comments_per_page = 5 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0519b6c..f5d3e62 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -940,7 +940,8 @@ module ApplicationHelper end def expandable_text_area(object_name, method, text_area_id, options = {}) - text_area(object_name, method, { :id => text_area_id, :onkeyup => "grow_text_area('#{text_area_id}')" }.merge(options)) + options[:class] = (options[:class] || '') + ' autogrow' + text_area(object_name, method, { :id => text_area_id }.merge(options)) end def pluralize_without_count(count, singular, plural = nil) diff --git a/app/views/profile/_profile_scrap_reply_form.html.erb b/app/views/profile/_profile_scrap_reply_form.html.erb index 04d0bac..b5824fe 100644 --- a/app/views/profile/_profile_scrap_reply_form.html.erb +++ b/app/views/profile/_profile_scrap_reply_form.html.erb @@ -1,7 +1,7 @@