app/controllers/muck/activities_controller.rb in muck-activities-0.1.16 vs app/controllers/muck/activities_controller.rb in muck-activities-0.1.17

- old
+ new

@@ -2,23 +2,23 @@ unloadable include ApplicationHelper include MuckActivityHelper - before_filter :login_required + before_filter :login_required, :except => :index before_filter :find_parent, :only => [:index, :create] before_filter :get_activity, :only => [:destroy, :comment_html] def index if @parent.can_view?(current_user) @activities = get_activities(@parent) - respond_to do |format| - format.js do - render :partial => "activities/cached_activities", :locals => {:activities => @activities} - end - end + else + @activities = get_profile_activities(@parent) # only items for the profile end + respond_to do |format| + format.js { render :text => get_activities_html(@activities) } + end end def create @activity = @parent.activities.build(params[:activity]) @activity.source = @parent @@ -125,9 +125,15 @@ format.json { render :json => { :success => false, :message => t("muck.activities.item_could_not_be_removed") } } end end protected + + def get_activities_html(activities) + render_as_html do + render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities}) + end + end def get_status_html(activity) render_as_html do render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity}) end \ No newline at end of file