app/controllers/integral/backend/activities_controller.rb in integral-1.4.0 vs app/controllers/integral/backend/activities_controller.rb in integral-1.5.0

@@ -1,49 +1,39 @@
 module Integral
   module Backend
     # Activity management
     class ActivitiesController < BaseController
       before_action :authorize_with_klass, except: [:widget]
-      before_action -> { set_grid }
 
       def widget
-        activities = cast_activities(@grid.assets.limit(10))
+        activities = cast_activities(resource_grid.assets.where.not(whodunnit: nil).limit(10))
         last_created_at = activities.last.created_at.utc if activities.present?
 
         render json: { content: render_to_string(partial: 'integral/backend/activities/activity', collection: activities), last_created_at: last_created_at }
       end
 
-      # POST /grid
-      # AJAX grid for activities
-      # TODO: Could move this grid action into index action and respond different if json request
-      def grid
-        render json: { content: render_to_string(partial: 'integral/backend/activities/grid',
-                                                 locals: { grid: @grid }) }
-      end
-
       # GET /
       # Lists all activities
-      def index; end
+      def index
+        respond_to do |format|
+          format.html
+          format.json do
+            render json: { content: render_to_string(partial: "integral/backend/shared/grid/grid") }
+          end
+        end
+      end
 
-      # TODO: Implement this or some particular versioned one through routes.
-      #
-      # /admin/pages/activity -> All Page activity
-      # /admin/pages/:id/activity -> Specific Page activity
-      #
-      # /admin/posts/activity -> All Page activity
-      # /admin/posts/:id/activity -> Specific Page activity
-      #
-      # etc
-      #
-      # # GET /activity:id
-      # # View an Activity
-      # def show
-      #   @activity = Integral::Version.find(params[:id])
-      # end
-
       private
 
+      def list_backend_resources_url
+        backend_activities_url
+      end
+
+      def backend_resource_url(resource)
+        resource.url
+      end
+
       def set_breadcrumbs
         add_breadcrumb I18n.t('integral.breadcrumbs.dashboard'), :backend_dashboard_url
         add_breadcrumb I18n.t('integral.breadcrumbs.activity'), :backend_activities_url
       end
 
@@ -59,8 +49,12 @@
         grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :user, :action, :object, :created_at, :item_id) : {}
         grid_params.delete_if { |_k, v| v.empty? }
         { 'order' => 'date', 'page' => 1, descending: true }.merge(grid_params)
       end
       helper_method :grid_options
+
+      def render_default_action_bar?
+        false
+      end
     end
   end
 end