ab_admin 0.9.0 → 0.10.0

data/app/controllers/admin/base_controller.rb

@@ -1,44 +1,39 @@
 class Admin::BaseController < ::InheritedResources::Base
-  use Rack::Pjax, only: :index
-
-  layout :set_layout
-
   include AbAdmin::Controllers::Fv
   include AbAdmin::Controllers::Callbacks
 
-  define_admin_callbacks :save, :create
+  class_attribute :export_builder, :batch_actions, :button_scopes, instance_reader: true, instance_writer: false
+  attr_reader :settings
 
-  before_action :authenticate_user!, :require_admin_access, :build_settings, :set_user_vars
+  before_action :authenticate_user!, :require_admin_access, :manager, :build_settings, :set_user_vars
   before_action :add_breadcrumbs, :set_title, unless: :xhr?
+  before_action :preflight_batch_action, only: :batch
 
-  class_attribute :export_builder, :batch_action_list, :button_scopes, instance_reader: false, instance_writer: false
-
-  defaults finder: :friendly_find
-
-  has_scope :by_ids, type: :array
-
-  helper_method :admin?, :moderator?
-
-  attr_reader :settings
-  helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items, :query_params,
-                :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer,
+  helper_method :admin?, :moderator?, :button_scopes, :collection_action?, :action_items, :resource_action_items, :query_params,
+                :settings, :batch_actions, :tree_node_renderer,
                 :pjax?, :xhr?, :params_for_links, :resource_list_id, :ransack_collection, :search_collection
 
+  define_admin_callbacks :save, :create
+  use Rack::Pjax, only: :index
+  defaults finder: :friendly_find
   rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
+  layout :set_layout
 
   def index
     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(self, locale: params[:locale]), filename: doc.filename, type: Mime[:csv], disposition: 'attachment')
-      end
-      if Mime[:xlsx]
-        format.xlsx do
+      if settings[:export]
+        format.csv do
           authorize! :export, resource_class
-          doc = AbAdmin::Utils::XlsDocument.new(collection, export_options)
-          send_data(doc.render(self, locale: params[:locale]), filename: doc.filename, type: Mime[:xlsx], disposition: 'attachment')
+          doc = AbAdmin::Utils::CsvDocument.new(collection, export_options)
+          send_data(doc.render(self, locale: params[:locale]), filename: doc.filename, type: Mime[:csv], disposition: 'attachment')
+        end
+        if Mime[:xlsx]
+          format.xlsx do
+            authorize! :export, resource_class
+            doc = AbAdmin::Utils::XlsDocument.new(collection, export_options)
+            send_data(doc.render(self, locale: params[:locale]), filename: doc.filename, type: Mime[:xlsx], disposition: 'attachment')
+          end
         end
       end
     end
@@ -49,10 +44,15 @@ class Admin::BaseController < ::InheritedResources::Base
       success.html { redirect_to redirect_to_on_success }
       success.js { render layout: false }
       failure.js { render :new, layout: false }
+      unless respond_to_format?(:json)
+        success.json { head :no_content }
+        failure.json { render json: {errors: resource.errors}, status: :unprocessable_entity }
+      end
     end
   end
 
   def update
+    resource.last_updated_timestamp = params[:last_updated_timestamp].to_i if settings[:safe_save] && !params[:_force_save] && params[:last_updated_timestamp]
     update! do |success, failure|
       success.html { redirect_to redirect_to_on_success }
       failure.html { render :edit }
@@ -60,7 +60,7 @@ class Admin::BaseController < ::InheritedResources::Base
       failure.js { render :edit, layout: false }
       unless respond_to_format?(:json)
         success.json { head :no_content }
-        failure.json { head :unprocessable }
+        failure.json { render json: {errors: resource.errors}, status: :unprocessable_entity }
       end
     end
   end
@@ -91,32 +91,26 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def batch
-    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) }
-      if batch_action.to_s.end_with?('_collection')
-        count = collection.size
-        resource_class.public_send(batch_action, collection, *[params[:batch_params]].compact)
-        if @settings[:history]
-          if Object.const_defined?('ActiveRecord::Import') && Track.respond_to?(:import)
-            tracks = collection.map { |item| track_action("batch_#{batch_action}", item) }
-            Track.import_from_batch_collection_action(tracks)
-          else
-            collection.each { |item| track_action!("batch_#{batch_action}", item) }
-          end
-        end
-      else
-        count = collection.inject(0) { |c, item| apply_batch_action(item, batch_action, *[params[:batch_params]].compact) ? c + 1 : c }
-      end
-      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
+    batch_action = batch_actions.detect{|a| a.name == params[:batch_action].to_sym }
+    count = collection.inject(0) { |c, item| apply_batch_action(item, batch_action, *params[:batch_params].presence) ? c + 1 : c }
+    flash[:success] = I18n.t('admin.batch_actions.status', count: count, action: batch_action.title)
     redirect_to_back_or_root
   end
 
-  protected
+  private
+
+  def manager
+  end
+
+  def set_layout
+    pjax? ? false : 'admin/application'
+  end
+
+  def preflight_batch_action
+    batch_action = params[:batch_action].to_sym
+    head :unprocessable_entity unless allow_batch_action?(batch_action) && params[:q].try!(:[], :id_in).present?
+    raise CanCan::AccessDenied unless collection.all?{|item| can?(batch_action, item) }
+  end
 
   def build_resource_params
     permitted_params || params[resource_class.model_name.param_key]
@@ -133,22 +127,26 @@ class Admin::BaseController < ::InheritedResources::Base
   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.update instance_exec(&@settings[:default_url_options]) if @settings && @settings[:default_url_options]
     options
   end
 
+  def self.batch_action(name, options={}, &block)
+    if options
+      self.batch_actions << AbAdmin::Config::BatchAction.new(name.to_sym, options, &block)
+    else
+      self.batch_actions.reject!{|a| a.name == name.to_sym }
+    end
+  end
+
   def apply_batch_action(item, batch_action, *batch_params)
-    success = item.send(batch_action, *batch_params)
-    track_action!("batch_#{batch_action}", item) if @settings[:history]
+    success = batch_action.data.is_a?(Symbol) ? item.public_send(batch_action.data, *batch_params) : batch_action.data.call(item)
+    track_action!("batch_#{batch_action.name}", item) if settings[:history]
     success
   end
 
   def allow_batch_action?(batch_action)
-    batch_action_list.detect { |a| a.name == batch_action }
-  end
-
-  def redirect_to_back_or_root
-    redirect_back fallback_location: admin_root_path
+    batch_actions.detect { |a| a.name == batch_action }
   end
 
   def track_action(key=nil, item=nil)
@@ -159,19 +157,6 @@ class Admin::BaseController < ::InheritedResources::Base
     track_action(*args).save!
   end
 
-  def batch_action_list
-    self.class.batch_action_list ||= begin
-      resource_class.batch_actions.map do |a|
-        opts = a == :destroy ? {confirm: I18n.t('admin.delete_confirmation')} : {}
-        if a.is_a?(Hash)
-          opts.merge!(a.except(:name))
-          a = a[:name]
-        end
-        AbAdmin::Config::BatchAction.new(a, opts)
-      end
-    end
-  end
-
   def self.inherited(base)
     super
     base.class_eval do
@@ -179,6 +164,8 @@ class Admin::BaseController < ::InheritedResources::Base
       before_save :bind_current_updater
       before_save :track_current_action
     end
+    base.button_scopes = []
+    base.batch_actions = [AbAdmin::Config::BatchAction.new(:destroy, confirm: I18n.t('admin.delete_confirmation'))]
   end
 
   def track_current_action(*)
@@ -202,10 +189,6 @@ class Admin::BaseController < ::InheritedResources::Base
     export_builder.render_options
   end
 
-  def preview_resource_path(item)
-    nil
-  end
-
   def custom_settings
     {}
   end
@@ -219,7 +202,8 @@ class Admin::BaseController < ::InheritedResources::Base
       @settings[:per_page] ||= per_page
       @settings[:per_page_variants] ||= @settings[:per_page_variants].find_all{|n| n <= @settings[:max_per_page] }
       @settings[:sidebar] = true unless @settings.key?(:sidebar)
-      @settings[:pagination] = @settings[:pagination_index_views].include?(@settings[:current_index_view])
+      @settings[:pagination] = @settings[:pagination_index_views].include?(@settings[:current_index_view]) unless @settings.key?(:pagination)
+      @settings[:order] = active_scopes.filter_map{|sc| sc.options[:default_order] }.first || @settings[:default_order] || ('id desc' unless @settings[:current_index_view] == :tree)
     end
     @settings[:well] = (collection_action? || %w(show history).include?(action_name)) && @settings[:current_index_view] != :tree unless @settings.key?(:well)
   end
@@ -243,19 +227,6 @@ class Admin::BaseController < ::InheritedResources::Base
     @settings[:collection_actions].include?(action_name)
   end
 
-  def self.scope(name, options={}, &block)
-    has_scope name, options.without(:badge, :if), &block
-    options[:badge] = {} if options[:badge] && !options[:badge].is_a?(Hash)
-    options[:block] = block
-    self.button_scopes ||= []
-    self.button_scopes << [name, options]
-  end
-
-  def button_scopes
-    self.class.button_scopes ||= self.class.scopes_configuration.except(:by_ids).find_all{|_, s| s[:type] == :boolean }
-    self.class.button_scopes.to_h
-  end
-
   def add_breadcrumbs
     @breadcrumbs = []
     if parent?
@@ -306,18 +277,28 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def query_params
-    query = params[:q].try! {|q| q.permit!.to_h} || {}
-    nested = resource_class.respond_to?(:acts_as_nested_set_options) && @settings[:current_index_view] == :tree
-    query[:s] ||= @settings[:default_order] || ('id desc' unless nested)
-    query.reject_blank
+    @query_params ||= begin
+      query = params[:q].try! {|q| q.permit!.to_h} || {}
+      query[:s] ||= @settings[:order]
+      query.reverse_merge!(@settings[:default_q].to_h{ [_1.to_s, _2.to_s] }) if @settings[:default_q] && !params[:q]
+      query.reject_blank
+    end
+  end
+
+  def self.scope(name, options={}, &block)
+    self.button_scopes << ::AbAdmin::Config::Scope.new(name, options, &block)
+  end
+
+  def active_scopes
+    button_scopes.find_all{|scope| params[scope.name].present? }
   end
 
   def with_scopes(relation)
-    relation
+    active_scopes.inject(relation) { |result, scope| scope.apply(self, result) }
   end
 
-  def set_layout
-    pjax? ? false : 'admin/application'
+  def redirect_to_back_or_root
+    redirect_back fallback_location: admin_root_path, turbolinks: false
   end
 
   def back_or_collection
@@ -382,7 +363,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def require_admin_access
-    raise CanCan::AccessDenied unless current_user.admin_access?
+    raise CanCan::AccessDenied unless current_user&.admin_access?
   end
 
   def bind_current_user(*)
@@ -393,13 +374,14 @@ class Admin::BaseController < ::InheritedResources::Base
     resource.updater_id = current_user.id if !@settings[:skip_bind_current_updater] && resource.respond_to?(:updater_id)
   end
 
-  def get_subject
-    params[:id] ? resource : resource_class
+  def authenticate_user!
+    Rails.logger.debug "Redirect unauthorized user"
+    super
   end
 
   def render_unauthorized(exception)
-    Rails.logger.debug "Access denied on #{exception.action} #{exception.subject.inspect}, user: #{current_user.try(:id)}"
-
+    Rails.logger.debug "Access denied on #{exception.action} #{exception.subject.inspect}, user: #{current_user&.id}"
+    render_not_found and return unless AbAdmin.render_unauthorized
     if pjax?
       render partial: 'admin/shared/flash', locals: {flash: {alert: exception.message}}
     elsif request.format.try(:html?)
@@ -409,11 +391,11 @@ class Admin::BaseController < ::InheritedResources::Base
     end
   end
 
-  def default_serializer_options
-    if resource_class
-      {root: resource_class.model_name.plural}
+  def render_not_found
+    if request.format.try(:html?)
+      render file: Rails.root.join('public/404.html'), layout: false, status: :not_found
     else
-      {root: false}
+      head :not_found
     end
   end
 
@@ -421,8 +403,6 @@ class Admin::BaseController < ::InheritedResources::Base
     "list_#{resource_instance_name}_#{resource.id}"
   end
 
-  private
-
   def per_page
     request_per_page = (params[:per_page].presence || cookies[:pp].presence).to_i.nonzero?
     params[:per_page] = [request_per_page || @settings[:view_default_per_page][@settings[:current_index_view]], @settings[:max_per_page]].min

data/app/controllers/admin/manager_controller.rb

@@ -1,9 +1,6 @@
 class ::Admin::ManagerController < ::Admin::BaseController
-  include AbAdmin::Utils::EvalHelpers
   include AbAdmin::Controllers::Tree
 
-  prepend_before_action :manager
-
   load_and_authorize_resource
 
   helper_method :manager, :admin_partial_name, :history_resource_path, :fetch_admin_template
@@ -11,23 +8,19 @@ class ::Admin::ManagerController < ::Admin::BaseController
   def custom_action
     custom_action = manager.custom_action_for(params[:custom_action], self)
     if custom_action.options[:method] && custom_action.options[:method] != request.method_symbol
-      raise ActionController::RoutingError.new("AbAdmin custom action for #{params[:custom_action]} not found")
+      raise ActionController::RoutingError.new("AbAdmin custom action #{custom_action.options[:method].to_s.upcase} #{params[:custom_action]} not allowed for #{request.method_symbol} method")
     end
     instance_exec(&custom_action.data)
   end
 
-  protected
+  private
 
   def button_scopes
-    manager.scopes.map{|scope| [scope.name, scope.options] }
-  end
-
-  def with_scopes(relation)
-    scopes_to_apply.inject(relation) { |result, scope| scope.apply(result, params) }
+    manager.scopes
   end
 
-  def scopes_to_apply
-    manager.scopes.find_all{|scope| params[scope.name].present? }
+  def batch_actions
+    manager.batch_actions
   end
 
   def begin_of_association_chain
@@ -80,21 +73,6 @@ class ::Admin::ManagerController < ::Admin::BaseController
     manager.default_action_items_for(action_name.to_sym, for_resource) + manager.action_items_for(action_name.to_sym)
   end
 
-  def apply_batch_action(item, batch_action, *batch_params)
-    data = manager.batch_action_list.detect{|a| a.name == batch_action }.data
-    success = call_method_or_proc_on item,  data, exec: false, attrs: batch_params
-    track_action!("batch_#{batch_action}", item) if settings[:history]
-    success
-  end
-
-  def allow_batch_action?(batch_action)
-    manager.batch_action_list.detect { |a| a.name == batch_action }
-  end
-
-  def batch_action_list
-    manager.batch_action_list
-  end
-
   def custom_settings
     manager.custom_settings || {}
   end
@@ -107,13 +85,11 @@ class ::Admin::ManagerController < ::Admin::BaseController
     @manager ||= begin
       manager_class_name = "AbAdmin#{resource_class.name}"
       manager_instance = manager_class_name.constantize.instance
-      unless manager_instance.allow_action?(action_name)
-        raise ActionController::RoutingError.new("AbAdmin action #{action_name} for #{resource_class.name} not found")
-      end
+      raise ActionController::RoutingError.new("AbAdmin action #{action_name} not found") unless manager_instance.allow_action?(action_name)
       manager_instance
     rescue NameError => e
-      if e.message.include?(manager_class_name)
-        raise ActionController::RoutingError.new("AbAdmin manager_model for #{resource_class.name} not found (#{e.message})")
+      if e.message.include?("uninitialized constant #{manager_class_name}")
+        raise ActionController::RoutingError.new("AbAdmin manager for #{resource_class.name} not found (#{e.message})")
       else
         raise
       end
@@ -122,9 +98,14 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   def resource_class
     @model ||= begin
-      params[:model_name].classify.constantize
-    rescue NameError => e
-      raise ActionController::RoutingError.new("AbAdmin model #{params[:model_name]} not found (#{e.message})")
+      model_name = params[:model_name].classify
+      model_name.constantize
+      rescue NameError => e
+        if e.message.include?("uninitialized constant #{model_name}")
+          raise ActionController::RoutingError.new("AbAdmin model #{model_name} not found (#{e.message})")
+        else
+          raise
+        end
     end
   end
 
@@ -140,19 +121,8 @@ class ::Admin::ManagerController < ::Admin::BaseController
     end
   end
 
-  def preview_resource_path(item)
-    return unless manager.preview_path
-    return if manager.preview_path[:options][:if] && !call_method_or_proc_on(item, manager.preview_path[:options][:if])
-    I18n.with_locale I18n.default_locale do
-      manager.preview_path[:value].is_a?(Proc) ? instance_exec(item, &manager.preview_path[:value]) : send(manager.preview_path[:value], item)
-    end
-  end
-
   def admin_partial_name(builder)
-    builder.partial ||= begin
-      #if template_exists?(builder.partial_name, "admin/#{resource_collection_name}", true)
-      fetch_admin_template(builder.partial_name, true)
-    end
+    builder.partial ||= fetch_admin_template(builder.partial_name, true)
   end
 
   def fetch_admin_template(template_name, partial=false)

data/app/views/ab_admin/devise/sessions/new.html.slim

@@ -3,6 +3,8 @@
   .form-inputs
     = f.input :email, required: false, autofocus: true
     = f.input :password, required: false
+    - if devise_mapping.try(:two_factor_authenticatable?)
+      = f.input :otp_attempt, required: false
     = f.input :remember_me, as: :boolean, wrapper: :default if devise_mapping.rememberable?
   = f.button :submit, t('admin.auth.sessions.button', default: 'Sign in'), class: 'btn-primary btn-large'
   br

data/app/views/admin/assets/batch_edit.html.slim

@@ -7,7 +7,8 @@
           a.thumbnail href=asset.url target='_blank' = image_tag(asset.thumb_url)
         .span8
           - if first_locale == l
-            p= text_field :data, :base_filename, index: asset.id, value: asset.base_filename, placeholder: Asset.han(:data_file_name), style: 'width: 95%;'
+            .muted= asset.original_name
+            div= text_field :data, :human_filename, index: asset.id, value: asset.human_filename, placeholder: Asset.han(:data_file_name), style: 'width: 95%;'
           - [:alt, :name].each do |attr|
             - loc_attr = "#{attr}_#{l}"
             p= text_field :data, loc_attr, index: asset.id, value: asset.send(loc_attr), placeholder: Asset.han(attr), style: 'width: 95%;'

data/app/views/admin/base/_search_layout.html.slim

@@ -5,7 +5,7 @@
     div
       = f.submit t('admin.search.submit'), class: 'btn btn-success search-submit'
       button.js-search-cancel.btn.search-cancel= icon('remove')
-  = render 'search_form', f: f
+  = render settings[:search_form_name] || 'search_form', f: f
   div
     = f.submit t('admin.search.submit'), class: 'btn btn-success search-submit'
     button.js-search-cancel.btn.search-cancel= icon('remove')

data/app/views/admin/base/create.js.erb

@@ -10,7 +10,7 @@
   $('#<%= form_wrap_id %>').remove();
   $('#list tbody:first').prepend('<%= j html %>');
   $(document).trigger('admin:list_init');
-  $('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
+  $('#<%= dom_id(resource, 'list') %>').addClass('bg-lemon');
 <% end %>
 
 window.ab_admin_last_created = <%= raw resource.for_input_token.to_json %>;

data/app/views/admin/base/edit.js.erb

@@ -10,7 +10,7 @@
   %>
   $('#<%= form_wrap_id %>').remove();
   $('#<%= el_id %>').after('<%= j html %>');
-  $('#<%= form_wrap_id %> td:first').attr('colspan', $('#<%= form_wrap_id %>').prev('tr').find('> td').length);
+  $('#<%= form_wrap_id %> > td').attr('colspan', $('#list > thead > tr:first th').length);
   $('#<%= form_wrap_id %> form').trigger('admin:form_init');
   $('#<%= el_id %>').scrollToEl();
 <% end %>

data/app/views/admin/base/new.js.erb

@@ -9,7 +9,7 @@
   %>
   $('#<%= form_wrap_id %>').remove();
   $('#list tbody:first').prepend('<%= j html %>');
-  $('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
+  $('#<%= form_wrap_id %> > td').attr('colspan', $('#list > thead > tr > th').length);
   $('#<%= form_wrap_id %> form').trigger('admin:form_init');
 <% end %>
 

data/app/views/admin/base/update.js.erb

@@ -1,8 +1,9 @@
+<%= render 'admin/shared/flash' %>
+
 <% if params[:flash] %>
   flash("<%= t("flash.admin.actions.#{action_name}.notice", resource_name: resource_class.model_name.human(count: 1)) %>")
 <% end %>
 
-
 <% unless params[:modal] %>
   <%
     form_wrap_id = dom_id(resource, 'list_edit')
@@ -12,8 +13,7 @@
   $('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');
   var $el = $('#<%= dom_id(resource, 'list') %>');
   $(document).trigger('admin:list_init');
-  if (!$el[0].className) $el.addClass('success');
-  $el.scrollToEl();
+  $el.addClass('bg-lemon');
 <% end %>
 
 window.ab_admin_last_updated = <%= raw resource.for_input_token.to_json %>;

data/app/views/admin/manager/_show_table.html.slim

@@ -4,4 +4,4 @@
   - show_builder.fields.each do |field|
     tr
       td= ha(field.name)
-      td= admin_pretty_data call_method_or_proc_on(resource, field.data)
+      td= admin_pretty_data method_or_proc_on(field.data, resource)

data/app/views/admin/manager/_stats.html.slim

@@ -0,0 +1,4 @@
+- if tmpl = admin_partial_name(stats_builder)
+  = render partial: tmpl, locals: local_assigns
+- else
+  h2 Generic stats template is not implemented yet. It can be here `admin/#{resource_collection_name}/_stats.html.slim`

data/app/views/admin/manager/_table.html.slim

@@ -19,12 +19,15 @@
     tbody
       - is_edit_link = manager.actions.include?(:edit)
       - collection.each do |item|
-        tr id=dom_id(item, 'list') class=(call_method_or_proc_on(item, table_builder.options[:row_class]) if table_builder.options[:row_class])
+        tr id=dom_id(item, 'list') class=method_or_proc_on(table_builder.row_html_class, item)
           = batch_action_item(item)
-          td= id_link(item, edit: is_edit_link)
+          td
+            = id_link(item, edit: is_edit_link)
+            - if settings[:id_column_with_created_at]
+              div: i= l(item.created_at, format: AbAdmin.datetime_format)
           = item_index_actions_panel(item)
           - table_builder.fields.each do |field|
-            td class=(field.options[:cell_class] if field.options[:cell_class])
+            td class=field.options[:cell_html_class]
               - field_content = table_item_field(item, field)
               - if field_content.present? && field.options[:copy_button]
                 - field_id = dom_id(item, field.name)

data/app/views/admin/shared/_content_actions.html.slim

@@ -5,22 +5,21 @@
         = t 'admin.batch_actions.title'
         span.caret
       ul.dropdown-menu
-        - batch_action_list.each do |ba|
+        - batch_actions.each do |ba|
           li: a.batch_action_link href='#' data-form=ba.form data-action=ba.name data-confirm=ba.confirm = ba.title
   - if settings[:button_scopes] && button_scopes.present?
     .btn-group
-      - button_scopes.each do |name, opts|
-        - next if opts[:if] && !call_method_or_proc_on(controller, opts[:if])
-        - param_name = opts[:as] || name
-        - active = params[param_name]
-        - url = url_for(param_name => (active ? nil : 1), index_view: params[:index_view])
-        a.btn href=url title=opts[:title] class=[opts[:class], ('active' if active), ('tool tool-bottom' if opts[:title])]
-          = opts[:label] || opts[:title] || t("admin.scopes.#{name}", default: name.to_s.titleize)
-          - if opts[:badge]
-            - scope = opts[:block] ? opts[:block].call(controller, resource_class) : resource_class.send(name)
-            - scope_count = scope.send(*[opts[:badge][:value_type] || :count, opts[:badge][:column]].compact)
+      - button_scopes.each do |s|
+        - next unless option_conditions_met?(s.options)
+        - active = params[s.param_name]
+        - url = url_for(s.param_name => (active ? nil : 1), index_view: params[:index_view])
+        a.btn href=url title=s.options[:title] class=[s.options[:class], ('active' if active), ('tool tool-bottom' if s.options[:title])]
+          = s.options[:label] || s.options[:title] || t("admin.scopes.#{s.name}", default: s.name.to_s.titleize)
+          - if s.options[:badge]
+            - scope = s.apply(self, resource_class.accessible_by(current_ability))
+            - scope_count = scope.send(*[s.options[:badge][:value_type] || :count, s.options[:badge][:column]].compact)
             - unless scope_count.zero?
-              span.badge< class=("badge-#{opts[:badge].try(:[], :type) || 'important'}") = scope_count
+              span.badge< class=("badge-#{s.options.dig(:badge, :type) || 'important'} #{'pulse' if s.options.dig(:badge, :pulse)}") = scope_count
 
   - if settings[:current_index_view] == :table
     .btn-group#columns_hider_wrap
@@ -38,7 +37,7 @@
       - settings[:index_views].each do |index_view|
         = index_view_link(index_view)
 
-  - if can?(:export, resource_class) && !settings[:skip_export]
+  - if settings[:export] && can?(:export, resource_class)
     .btn-group.downloads
       = icon('download-alt')
       - %w(csv xlsx).each do |format|
@@ -56,6 +55,14 @@
         .label> class=(ag[:css] || 'label-success')
           => ag[:label] || "#{ag[:column].to_s.humanize}:"
           - if !ag[:type] || ag[:type] == :sum
-            = search_collection.distinct(false).sum(ag[:column]).try!(:round, 2)
+            - res = search_collection.unscope(:includes).distinct(false).sum(ag[:column])
+            = number_with_delimiter(res.round(2), delimiter: ' ') if res
           - elsif ag[:type] == :average
-            = search_collection.average(ag[:column]).try!(:round, 2)
+            - res = search_collection.unscope(:includes).average(ag[:column])
+            = number_with_delimiter(res.round(2), delimiter: ' ') if res
+          - elsif ag[:type] == :pct
+            - sc_count = search_collection.count
+            - if sc_count.zero?
+              | 0%
+            - else
+              = "#{(search_collection.where.not(ag[:column] => nil).count.to_f / search_collection.count * 100).try!(:round, 2)}%"

data/app/views/admin/shared/_save_buttons.html.slim

@@ -1,10 +1,19 @@
 - return_to = params[:return_to].presence || request.referer || collection_path
-- return_to = "#{return_to}##{dom_id(resource, 'list')}" if resource.persisted?
+- return_to = "#{return_to.split('#', 2).first}##{dom_id(resource, 'list')}" if resource.persisted?
 input type='hidden' name='return_to' value=return_to
+- if settings[:safe_save] && resource.updated_at
+  input type='hidden' name='last_updated_timestamp' value=(resource.last_updated_timestamp || resource.updated_timestamp.to_i)
 .form-actions
   button.btn.btn-primary type="submit" name="_save" data-disable-with=t('admin.form.save')
     = icon('ok', true)
     = t('admin.form.save')
+  - if resource.errors.of_kind?(:base, :changed)
+    a.btn href=edit_resource_path(resource, return_to: params[:return_to])
+      = icon('repeat')
+      = t('admin.form.refresh')
+    button.btn.btn-warning type="submit" name="_force_save" data-disable-with='Force'
+      = icon('fire', true)
+      = t('admin.form.force_save')
   span.extra_buttons
     - unless resource.new_record?
       span.next_prev_buttons

data/app/views/admin/users/_form.html.slim

@@ -18,8 +18,8 @@
     = f.input :locale, collection: AbAdmin.translated_locales
     = f.input :bg_color, as: :color
 
-    = f.input :password, input_html: {autocomplete: 'off'}
-    = f.input :password_confirmation, input_html: {autocomplete: 'off'}
+    = f.input :password, input_html: {autocomplete: 'new-password'}
+    = f.input :password_confirmation, input_html: {autocomplete: 'new-password'}
 
   = f.input :avatar, as: :uploader, edit_meta: true