app/controllers/cambium/admin_controller.rb in cambium-1.0.4 vs app/controllers/cambium/admin_controller.rb in cambium-1.1.0

@@ -1,90 +1,90 @@
-module Cambium
-  class AdminController < ActionController::Base
+class Cambium::AdminController < Cambium::BaseController
 
-    before_filter :authenticate_admin!
-    before_filter :set_activities
+  before_filter :authenticate_admin!
+  before_filter :set_activities
 
-    layout "admin"
+  layout "admin"
 
-    include CambiumHelper
+  include Cambium::CambiumHelper
 
-    def index
-      respond_to do |format|
-        format.html do
-          @collection = admin_model.send(admin_table.scope)
-            .page(params[:page] || 1).per(15)
-        end
-        format.csv do
-          @collection = admin_model.send(admin_table.scope)
-          send_data admin.to_csv(@collection)
-        end
+  def index
+    respond_to do |format|
+      format.html do
+        @collection = admin_model.send(admin_table.scope)
+          .page(params[:page] || 1).per(15)
       end
+      format.csv do
+        @collection = admin_model.send(admin_table.scope)
+        send_data admin.to_csv(@collection)
+      end
     end
+  end
 
-    def show
-      set_object
-      redirect_to(admin_routes.edit)
+  def show
+    set_object
+    redirect_to(admin_routes.edit)
+  end
+
+  def new
+    @object = admin_model.new
+  end
+
+  def create
+    set_object
+    @object = admin_model.new(create_params)
+    if @object.save
+      redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} created!")
+    else
+      render 'new'
     end
+  end
 
-    def new
-      @object = admin_model.new
+  def edit
+    set_object
+  end
+
+  def update
+    set_object
+    if @object.update(update_params)
+      redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} updated!")
+    else
+      render 'edit'
     end
+  end
 
-    def create
-      set_object
-      @object = admin_model.new(create_params)
-      if @object.save
-        redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} created!")
+  private
+
+    def set_object
+      if admin_model.new.respond_to?(:slug) && params[:slug]
+        slug = params[:"#{admin_model.to_s.underscore}_slug"] || params[:slug]
+        @object = admin_model.find_by_slug(slug)
       else
-        render 'new'
+        id = params[:"#{admin_model.to_s.underscore}_id"] || params[:id]
+        @object = admin_model.find_by_id(id.to_i)
       end
+      @obj = @object
     end
 
-    def edit
-      set_object
+    def authenticate_admin!
+      authenticate_user!
+      not_found unless current_user.is_admin?
     end
 
-    def update
-      set_object
-      if @object.update(update_params)
-        redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} updated!")
-      else
-        render 'edit'
-      end
+    def create_params
+      params
+        .require(admin_model.to_s.humanize.downcase.to_sym)
+        .permit(admin_form.fields.to_h.keys)
     end
 
-    private
+    def update_params
+      create_params
+    end
 
-      def set_object
-        if @object.respond_to?(:slug) && params[:slug]
-          @object = admin_model.find_by_slug(params[:slug])
-        else
-          @object = admin_model.find_by_id(params[:id])
-        end
-        @obj = @object
-      end
+    def set_activities
+      @activities = PaperTrail::Version.order(:created_at => :desc)
+        .includes(:item).limit(20)
+      @users = User.where(:id => @activities.collect(&:whodunnit)
+        .reject(&:blank?).map(&:to_i))
+    end
 
-      def authenticate_admin!
-        authenticate_user!
-        not_found unless current_user.is_admin?
-      end
-
-      def create_params
-        params
-          .require(admin_model.to_s.humanize.downcase.to_sym)
-          .permit(admin_form.fields.to_h.keys)
-      end
-
-      def update_params
-        create_params
-      end
-
-      def set_activities
-        @activities = PaperTrail::Version.order(:created_at => :desc)
-          .includes(:item).limit(20)
-        @users = User.where(:id => @activities.collect(&:whodunnit)
-          .reject(&:blank?).map(&:to_i))
-      end
-
-  end
 end