app/helpers/muck_activity_helper.rb in muck-activities-0.1.27 vs app/helpers/muck_activity_helper.rb in muck-activities-3.0.0
- old
+ new
@@ -35,11 +35,11 @@
# Renders an activity with only activities created by activities_object
# activities_object: object to get activities for
# limited: a value passed to each activity template which can result in a smaller amount of data
# being rendered
def limited_activity_feed_for(activities_object, limited = false)
- activities = activities_object.activities.latest.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+ activities = activities_object.activities.by_latest.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities, :limited => limited }
end
# Renders a full activity feed for activities_object
# activities_object: object to get activities for
@@ -108,20 +108,20 @@
request.url.gsub(request.query_string, '')
end
def get_profile_activities(activities_object)
if !params[:latest_activity_id].blank?
- activities_object.activities.latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+ activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
else
- activities_object.activities.latest.filter_by_template(params[:activity_filter]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+ activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
end
end
def get_activities(activities_object)
if !params[:latest_activity_id].blank?
- activities_object.activities.latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+ activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
else
- activities_object.activities.latest.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+ activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
end
end
# Render an activity using a block and the given activity.
# options:
\ No newline at end of file