ab_admin 0.3.6 → 0.4.0

data/app/assets/stylesheets/ab_admin/main.css.scss

@@ -1,9 +1,7 @@
-//= require ab_admin/bootstrap-datepicker
-//= require ab_admin/bootstrap-timepicker
 //= require bootstrap-wysihtml5
 //= require ab_admin/bootstrap-editable
 //= require select2
 //= require fancybox
 //= require ab_admin/bootstrap_and_overrides
+//= require ab_admin/bootstrap-datetimepicker
 //= require ab_admin/fileupload
-//q= require ab_admin/jquery.Jcrop.min

data/app/controllers/admin/admin_comments_controller.rb

@@ -1,10 +1,7 @@
 class Admin::AdminCommentsController < Admin::BaseController
   load_and_authorize_resource
 
-  before_create do |comment|
-    comment.set_author(current_user)
-    comment.user_id = comment.resource.user_id if comment.resource.respond_to?(:user_id)
-  end
+  helper_method :commentable
 
   def create
     create! do |format|
@@ -18,4 +15,17 @@ class Admin::AdminCommentsController < Admin::BaseController
     end
   end
 
+  private
+
+  def collection
+    if xhr?
+      @collection = AdminComment.find_for_resource(commentable)
+    else
+      super
+    end
+  end
+
+  def commentable
+    @commentable ||= AdminComment.find_resource(params[:resource_type], params[:resource_id])
+  end
 end

data/app/controllers/admin/assets_controller.rb

@@ -1,44 +1,41 @@
 class Admin::AssetsController < ApplicationController
-  before_filter :find_klass, only: [:create, :sort]
-  before_filter :find_asset, only: [:destroy, :main, :rotate, :crop]
-
-  respond_to :html, :xml
+  before_action :find_klass, only: :sort
+  before_action :find_asset, only: [:destroy, :main, :rotate, :crop]
 
   authorize_resource
 
-  def create
-    @asset = @klass.new(params[:asset])
+  respond_to :json
 
-    @asset.assetable_type = params[:assetable_type]
-    @asset.assetable_id = params[:assetable_id] || 0
+  def create
+    @asset = build_asset(params[:asset])
     @asset.guid = params[:guid]
-    @asset.data = params[:data]
+    @asset.data = prepared_data
     @asset.user = current_user
-    @asset.save
+    @asset.save!
 
-    respond_with(@asset) do |format|
-      format.html { head :ok }
-      format.xml { render xml: @asset.to_xml }
-    end
+    render json: @asset
   end
 
   def destroy
-    @asset.destroy
-
-    respond_with(@asset) do |format|
-      format.html { head :ok }
-      format.xml { render xml: @asset.to_xml }
-    end
+    @asset.destroy!
+    head :ok
   end
 
   def sort
     params[:asset].each_with_index do |id, index|
       @klass.move_to(index, id)
     end
+    head :ok
+  end
 
-    respond_with(@klass) do |format|
-      format.html { head :ok }
-    end
+  def batch_edit
+    @assets = Asset.includes(:translations).find(params[:ids])
+    render layout: false
+  end
+
+  def batch_update
+    Asset.update(params[:data].keys, params[:data].values)
+    head :ok
   end
 
   def rotate
@@ -55,18 +52,6 @@ class Admin::AssetsController < ApplicationController
 
   protected
 
-  def find_assets
-    assoc = params[:assetable_type].constantize.reflect_on_association(params[:assoc].to_sym)
-    scope = assoc.klass.where(assetable_type: params[:assetable_type], is_main: !assoc.collection?)
-    if params[:assetable_id].present?
-      scope.where(assetable_id: params[:assetable_id])
-    elsif params[:guid].present?
-      scope.where(guid: params[:guid])
-    else
-      []
-    end
-  end
-
   def find_asset
     @asset = Asset.find(params[:id])
   end
@@ -74,4 +59,28 @@ class Admin::AssetsController < ApplicationController
   def find_klass
     @klass = params[:klass].blank? ? Asset : params[:klass].classify.constantize
   end
+
+  def prepared_data
+    params[:data].original_filename = "blob.#{params[:data].content_type.split('/').last}" if params[:data].original_filename == 'blob'
+    params[:data]
+  end
+
+  def build_asset(asset_params)
+    raise 'Can not build Asset without assetable_type' if params[:assetable_type].blank?
+
+    assetable_klass = params[:assetable_type].constantize
+    assoc = assetable_klass.reflect_on_association(params[:method].to_sym)
+    if params[:assetable_id].to_i.zero?
+      assoc_scope = assoc.scope ? assoc.klass.instance_exec(&assoc.scope) : assoc.klass
+      assoc_scope.where(assetable_type: assetable_klass.name, assetable_id: 0).new(asset_params)
+    else
+      assetable = assetable_klass.find(params[:assetable_id])
+      if assoc.collection?
+        assetable.send(params[:method]).new(asset_params)
+      else
+        assetable.send("build_#{params[:method]}", asset_params)
+      end
+    end
+  end
+
 end

data/app/controllers/admin/base_controller.rb

@@ -3,22 +3,25 @@ class Admin::BaseController < ::InheritedResources::Base
 
   layout :set_layout
 
+  include AbAdmin::Controllers::Fv
   include AbAdmin::Controllers::Callbacks
+
   define_admin_callbacks :save, :create
 
-  before_filter :authenticate_user!, :require_moderator
-  before_filter :add_breadcrumbs, :set_title, :set_user_vars, unless: :xhr?
+  before_action :authenticate_user!, :require_require_admin_access, :set_user_vars
+  before_action :add_breadcrumbs, :set_title, unless: :xhr?
 
   class_attribute :export_builder, :batch_action_list, :button_scopes, instance_reader: false, instance_writer: false
 
-  has_scope :ids, type: :array
+  defaults finder: :friendly_find
+
+  has_scope :by_ids, type: :array
 
   helper_method :admin?, :moderator?
 
   helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items,
-                :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer
-
-  respond_to :json
+                :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer,
+                :normalized_index_views, :current_index_view, :pjax?, :xhr?
 
   rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
 
@@ -26,11 +29,13 @@ class Admin::BaseController < ::InheritedResources::Base
     super do |format|
       format.js { render layout: false }
       format.csv do
+        authorize! :export, resource_class
         doc = AbAdmin::Utils::CsvDocument.new(collection, export_options)
         send_data(doc.render, filename: doc.filename, type: Mime::CSV, disposition: 'attachment')
       end
       if defined?(Mime::XLSX)
         format.xls do
+          authorize! :export, resource_class
           doc = AbAdmin::Utils::XlsDocument.new(collection, export_options)
           send_data(doc.render, filename: doc.filename, type: Mime::XLSX, disposition: 'attachment')
         end
@@ -52,11 +57,24 @@ class Admin::BaseController < ::InheritedResources::Base
       failure.html { render :edit }
       success.js { render layout: false }
       failure.js { render :edit, layout: false }
+      unless Admin::ManagerController.mimes_for_respond_to[:json]
+        success.json { head :no_content }
+        failure.json { head :unprocessable }
+      end
     end
   end
 
   def destroy
-    destroy! { redirect_to_on_success }
+    destroy! do
+      track_action! if settings[:history]
+      redirect_to_on_success
+    end
+  end
+
+  def show
+    show! do |format|
+      format.js { render layout: false }
+    end
   end
 
   def edit
@@ -72,29 +90,47 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def batch
-    raise 'No ids specified for batch action' unless params[:ids].present?
+    raise 'No ids specified for batch action' unless params[:by_ids].present?
     batch_action = params[:batch_action].to_sym
     if allow_batch_action?(batch_action) && collection.all?{|item| can?(batch_action, item) }
       count = collection.inject(0) { |c, item| apply_batch_action(item, batch_action) ? c + 1 : c }
-      flash[:success] = I18n.t('admin.batch_actions.status', count: count, action: I18n.t("admin.actions.batch_#{batch_action}.title"))
+      batch_action_name = I18n.t("admin.actions.batch_#{batch_action}.title", default: batch_action.to_s.humanize)
+      flash[:success] = I18n.t('admin.batch_actions.status', count: count, action: batch_action_name)
     else
       raise CanCan::AccessDenied
     end
-    redirect_to :back
+    redirect_to_back_or_root
+  end
+
+  protected
+
+  def default_url_options
+    options = {format: nil}
+    options.update instance_exec(&AbAdmin.default_url_options) if AbAdmin.default_url_options
+    options.update instance_exec(&settings[:default_url_options]) if settings[:default_url_options]
+    options
   end
 
   def apply_batch_action(item, batch_action)
-    item.send(batch_action)
+    success = item.send(batch_action)
+    track_action!("batch_#{batch_action}", item) if settings[:history]
+    success
   end
 
   def allow_batch_action?(batch_action)
     resource_class.batch_actions.include?(batch_action)
   end
 
-  protected
+  def redirect_to_back_or_root
+    redirect_to request.env['HTTP_REFERER'] ? :back : admin_root_path
+  end
 
-  def default_url_options
-    {format: nil}
+  def track_action(key=nil, item=nil)
+    (item || resource).track(key: key || action_name, user: current_user)
+  end
+
+  def track_action!(*args)
+    track_action(*args).save!
   end
 
   def batch_action_list
@@ -111,6 +147,7 @@ class Admin::BaseController < ::InheritedResources::Base
     base.class_eval do
       before_create :bind_current_user
       before_save :bind_current_updater
+      before_save { track_action if settings[:history] }
     end
   end
 
@@ -136,7 +173,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def settings
-    {index_view: 'table', sidebar: collection_action?, well: (collection_action? || action_name == 'show'),
+    {index_view: 'table', sidebar: collection_action?, well: (collection_action? || %w(show history).include?(action_name)),
      search: true, batch: true, hotkeys: true}
   end
 
@@ -160,19 +197,13 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def button_scopes
-    self.class.button_scopes ||= begin
-      res = {}
-      self.class.scopes_configuration.except(:ids).each do |k, v|
-        res[k] = v if v[:type] == :default
-      end
-      res
-    end
+    self.class.button_scopes ||= self.class.scopes_configuration.except(:ids).find_all{|_, s| s[:type] == :boolean }.to_h
   end
 
   def add_breadcrumbs
     @breadcrumbs = []
     if parent?
-      @breadcrumbs << {name: parent_class.model_name.human(count: 9), url: parent_collection_path}
+      @breadcrumbs << {name: parent.class.model_name.human(count: 9), url: parent_collection_path}
       @breadcrumbs << {name: AbAdmin.display_name(parent), url: parent_path}
     end
     @breadcrumbs << {name: resource_class.model_name.human(count: 9), url: collection_path}
@@ -192,7 +223,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def parent_collection_path
-    {action: :index, controller: "admin/#{parent_class.model_name.plural}"}
+    {action: :index, controller: "admin/#{parent.class.model_name.plural}"}
   end
 
   def tree_node_renderer
@@ -212,7 +243,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def per_page
     return params[:per_page] if params[:per_page].present?
-    if settings[:index_view] == 'tree'
+    if current_index_view == 'tree'
       params[:per_page] = 1000
     else
       params[:per_page] = cookies[:pp] || 50
@@ -223,8 +254,18 @@ class Admin::BaseController < ::InheritedResources::Base
     pjax? ? false : 'admin/application'
   end
 
-  def pjax?
-    request.headers['X-PJAX']
+  def normalized_index_views
+    Array(settings[:index_view])
+  end
+
+  def current_index_view
+    index_view = params[:index_view].presence || cookies[:iv].presence
+    if index_view && normalized_index_views.include?(index_view)
+      cookies[:iv] = index_view
+      index_view
+    else
+      normalized_index_views.first
+    end
   end
 
   def back_or_collection
@@ -253,14 +294,28 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def set_user_vars
-    I18n.locale = Rails.application.config.i18n.default_locale
-    gon.locale = I18n.locale
-    gon.bg_color = current_user.bg_color
-    gon.admin = admin?
-    gon.test = Rails.env.test?
-    gon.hotkeys = settings[:hotkeys]
+    I18n.locale = AbAdmin.locale
+    fv.locale = I18n.locale
+    fv.bg_color = current_user.bg_color
+    fv.admin = admin?
+    fv.hotkeys = settings[:hotkeys]
+    fv.env = Rails.env
+    if AbAdmin.test_env?
+      fv.test = true
+      AbAdmin.test_settings.each { |k, v| fv.set_variable k, v }
+    end
+  end
+
+  # utility methods
+  def pjax?
+    request.headers['X-PJAX']
   end
 
+  def xhr?
+    request.xhr?
+  end
+
+  # user role logic
   def moderator?
     user_signed_in? && current_user.moderator?
   end
@@ -269,6 +324,10 @@ class Admin::BaseController < ::InheritedResources::Base
     user_signed_in? && current_user.admin?
   end
 
+  def require_require_admin_access
+    raise CanCan::AccessDenied unless current_user.admin_access?
+  end
+
   def require_moderator
     raise CanCan::AccessDenied unless moderator?
   end
@@ -285,10 +344,6 @@ class Admin::BaseController < ::InheritedResources::Base
     resource.updater_id = current_user.id if resource.respond_to?(:updater_id)
   end
 
-  def xhr?
-    request.xhr?
-  end
-
   # roles logic
   def role_given?
     fetch_role
@@ -319,7 +374,7 @@ class Admin::BaseController < ::InheritedResources::Base
     if pjax?
       render partial: 'admin/shared/flash', locals: {flash: {alert: exception.message}}
     elsif request.format.try(:html?)
-      redirect_to (moderator? ? admin_root_path : root_path), alert: exception.message
+      redirect_to (current_user.try(:admin_access?) ? admin_root_path : root_path), alert: exception.message
     else
       head :unauthorized
     end

data/app/controllers/admin/locators_controller.rb

@@ -1,8 +1,8 @@
 class ::Admin::LocatorsController < ::Admin::BaseController
   authorize_resource
 
-  before_filter :find_files, only: [:show, :edit, :update]
-  before_filter :find_file, only: [:edit, :update]
+  before_action :find_files, only: [:show, :edit, :update]
+  before_action :find_file, only: [:edit, :update]
 
   def edit
     @locale_hash = YAML.load_file(@file)
@@ -56,6 +56,7 @@ class ::Admin::LocatorsController < ::Admin::BaseController
   end
 
   def find_file
+    redirect_to(admin_locators_path) and return if params[:filename].blank?
     @file = @files.detect{|path| File.basename(path) == params[:filename]}
     raise "File #{params[:filename]} not found" unless @file
   end

data/app/controllers/admin/manager_controller.rb

@@ -2,11 +2,11 @@ class ::Admin::ManagerController < ::Admin::BaseController
   include AbAdmin::Utils::EvalHelpers
   include AbAdmin::Controllers::Tree
 
-  prepend_before_filter :manager
+  prepend_before_action :manager
 
   load_and_authorize_resource
 
-  helper_method :manager, :admin_partial_name
+  helper_method :manager, :admin_partial_name, :history_resource_path, :fetch_admin_template
 
   def custom_action
     custom_action = manager.custom_action_for(params[:custom_action], self)
@@ -69,7 +69,9 @@ class ::Admin::ManagerController < ::Admin::BaseController
   end
 
   def apply_batch_action(item, batch_action)
-    call_method_or_proc_on item, manager.batch_action_list.detect{|a| a.name == batch_action }.data, exec: false
+    success = call_method_or_proc_on item, manager.batch_action_list.detect{|a| a.name == batch_action }.data, exec: false
+    track_action!("batch_#{batch_action}", item) if settings[:history]
+    success
   end
 
   def allow_batch_action?(batch_action)
@@ -110,15 +112,19 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   def preview_resource_path(item)
     return unless manager.preview_path
-    manager.preview_path.is_a?(Proc) ? manager.preview_path.bind(self).call(item) : send(manager.preview_path, item)
+    manager.preview_path.is_a?(Proc) ? instance_exec(item, &manager.preview_path) : send(manager.preview_path, item)
   end
 
   def admin_partial_name(builder)
     builder.partial ||= begin
       #if template_exists?(builder.partial_name, "admin/#{resource_collection_name}", true)
-      if Dir[Rails.root.join("app/views/admin/#{resource_collection_name}/_#{builder.partial_name}.html.*")].present?
-        "admin/#{resource_collection_name}/#{builder.partial_name}"
-      end
+      fetch_admin_template(builder.partial_name, true)
+    end
+  end
+
+  def fetch_admin_template(template_name, partial=false)
+    if Dir[Rails.root.join("app/views/admin/#{resource_collection_name}/#{'_' if partial}#{template_name}.html.*")].present?
+      "admin/#{resource_collection_name}/#{template_name}"
     end
   end
 
@@ -142,14 +148,19 @@ class ::Admin::ManagerController < ::Admin::BaseController
     admin_new_path(options.merge(model_name: resource_collection_name))
   end
 
+  def resource_path(record=nil, options={})
+    record ||= resource
+    admin_show_path(options.merge(model_name: record.class.model_name.plural, id: record.id))
+  end
+
   def edit_resource_path(record=nil, options={})
     record ||= resource
     admin_edit_path(options.merge(model_name: record.class.model_name.plural, id: record.id))
   end
 
-  def resource_path(record=nil, options={})
+  def history_resource_path(record=nil, options={})
     record ||= resource
-    admin_show_path(options.merge(model_name: record.class.model_name.plural, id: record.id))
+    admin_history_path(options.merge(model_name: record.class.model_name.plural, id: record.id))
   end
 
   def self.cancan_resource_class