ab_admin 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b41478c7820e45d9a9deae90db880543e42050
-  data.tar.gz: 7c53e52bcde99999c83faf3105c3f7be082176be
+  metadata.gz: 07cf0aa2ce7c13f970015d489ec04b5d6bbb3e99
+  data.tar.gz: 568de144f99ceb62940e015ee41379ce70d76002
 SHA512:
-  metadata.gz: 0e43c703029a62700cf443d0460991011e5a3520569a03640d3e08afe30c59584c4fd5429bff961ce4575efb6630fa1f9fa8066b2afaf394a6298845aaf4a2a4
-  data.tar.gz: 520fbc9ebf7047fa5b9dff9ed8f433d2b15dc7e1feef02d933d5839ffe511b4fcc74b02fc2a8f0d92552cc5079b674a3443e1a86a7c5dccc3a6c06b43a3e0bae
+  metadata.gz: 4cb44209d391674ea609b3a3b154d1103f3bbcf56aed44f3f13a6f5a06a176f2189c17ad4fd65f7a9bf5325e542c9d6c2794b7411b11cf769dda97fd0fc0f5d1
+  data.tar.gz: 426d9d87810a841b6b04b2429d26ba548aae20e8f5e59f38224707d54c57affadf38d1533d5d307b96ac58b72f85e4fc90140cf756a718a202acafc235fda562

data/app/assets/javascripts/ab_admin/components/croppable_image.js.coffee

@@ -10,8 +10,9 @@ class window.CroppableImage
     _.defaults(@options, CroppableImage.crop_defaults)
     @options.onSelect = @setCropData
     @options.onChange = @setCropData
-
-    $('.fancybox-image:first').Jcrop @options
+    $img = $('.fancybox-image:first')
+    @options.trueSize = [$img[0].naturalWidth, $img[0].naturalHeight]
+    $img.Jcrop @options
     $('.fancybox-nav').hide()
 
     $cont = $('.fancybox-outer:first')
@@ -24,9 +25,9 @@ class window.CroppableImage
 
   cropHandler: (e) =>
     e.preventDefault()
-    asset_id = to_i($('.fancybox-image:first').attr('src').match(/\/[\d\/]{2,}\//)[0].replace(/\//g, ''))
-    $asset = $("#asset_#{asset_id}")
+    asset_id = to_i($('.fancybox-image:first').attr('src').match(/\/[\d\/]{1,}\//)[0].replace(/\//g, ''))
+    $asset = $(@options.asset_selector || "#asset_#{asset_id}")
     geometry = [@cropData['w'], @cropData['h'], @cropData['x'], @cropData['y']].join(',')
-    $.post "/admin/assets/#{$asset.data('id')}/crop", {geometry: geometry}, (data) =>
+    $.post "/admin/assets/#{asset_id}/crop", {geometry: geometry}, (data) =>
       $asset.replaceWith @el.data('assets').template(data.asset)
       $.fancybox.close()

data/app/assets/javascripts/ab_admin/components/select2_bridge.js.coffee

@@ -168,5 +168,12 @@ class window.Select2Bridge
             value = @el.closest(selectors[1] || 'html').find(selectors[0]).val()
             cond[kind_key][attr] = value if value
 
-    data = {q: term, class: @el.data('class'), token: true, page: page}
+    data =
+      q: term
+      class: @el.data('class')
+      token: true
+      page: page,
+      order: @el.data('order')
+      sort_mode: @el.data('sortMode')
+
     _.extend(data, cond)

data/app/assets/stylesheets/ab_admin/components/_table_view.scss

@@ -84,8 +84,52 @@ table.index_table {
   form.simple_form {
     margin: 0;
   }
+
+  .actions_panel {
+    width: 0px !important;
+    vertical-align: bottom !important;
+    padding: 0;
+    margin: 0;
+    border: none;
+    .actions_panel-wrap_outer {
+      position: relative;
+      top: 0px;
+      bottom: 0px;
+      height: 100%;
+      padding: 0 0 20px 0
+    }
+
+    .actions_panel-wrap_inner {
+      display: none;
+      position: absolute;
+      left: 100px;
+      width: auto;
+      height: 20px;
+      margin-top: 20px;
+      padding: 5px 12px;
+      background: #f6f6f6;
+      border-radius: 0 0 10px 10px;
+      box-shadow: 0 3px 5px #bbb;
+      border: #ccc 1px solid;
+      border-top: none;
+      z-index: 10;
+      text-align: center;
+      white-space: nowrap;
+      > * {
+        margin-top: -10px;
+      }
+      .hide_pane {
+        display: none;
+      }
+    }
+  }
+
+  tr:hover > td > .actions_panel-wrap_outer > .actions_panel-wrap_inner {
+    display: block;
+  }
 }
 
 #batch_action_form {
   margin-bottom: 10px;
-}
+}
+

data/app/controllers/admin/base_controller.rb

@@ -93,7 +93,13 @@ class Admin::BaseController < ::InheritedResources::Base
     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 }
+      if batch_action.to_s.end_with?('_collection')
+        count = collection.size
+        resource_class.public_send(batch_action, collection)
+        collection.each { |item| track_action!("batch_#{batch_action}", item) } if settings[:history]
+      else
+        count = collection.inject(0) { |c, item| apply_batch_action(item, batch_action) ? 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
@@ -247,7 +253,8 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def search_collection
     params[:q] ||= {}
-    params[:q][:s] ||= settings[:default_order] || 'id desc'
+    nested = resource_class.respond_to?(:acts_as_nested_set_options) && current_index_view == 'tree'
+    params[:q][:s] ||= settings[:default_order] || ('id desc' unless nested)
     @search = end_of_association_chain.accessible_by(current_ability).admin.ransack(params[:q].no_blank)
     @search.result(distinct: @search.object.joins_values.present?)
   end
@@ -363,11 +370,11 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def bind_current_user(*args)
-    resource.user_id = current_user.id if resource.respond_to?(:user_id)
+    resource.user_id = current_user.id if !settings[:skip_bind_current_user] && resource.respond_to?(:user_id)
   end
 
   def bind_current_updater(*args)
-    resource.updater_id = current_user.id if resource.respond_to?(:updater_id)
+    resource.updater_id = current_user.id if !settings[:skip_bind_current_updater] && resource.respond_to?(:updater_id)
   end
 
   # roles logic
@@ -413,4 +420,4 @@ class Admin::BaseController < ::InheritedResources::Base
       {root: false}
     end
   end
-end
+end

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', $('#list tr:first th').length);
+  $('#<%= form_wrap_id %> td:first').attr('colspan', $('#<%= form_wrap_id %>').prev('tr').find('> td').length);
   $('#<%= form_wrap_id %> form').trigger('admin:form_init');
   $('#<%= el_id %>').scrollToEl();
 <% end %>

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

@@ -1,5 +1,5 @@
 - if tmpl = admin_partial_name(form_builder)
-  = render tmpl
+  = render partial: tmpl, locals: local_assigns
 - else
   = admin_form_for resource do |f|
     - form_builder.fields.each do |node|
@@ -39,4 +39,4 @@
           - resource.tracks.recently.each do |a|
             tr
               td= l(a.created_at, format: :short)
-              td= auto_show_link a.user
+              td= auto_show_link a.user

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

@@ -1,5 +1,5 @@
 - if tmpl = admin_partial_name(show_builder)
-  = render tmpl
+  = render partial: tmpl, locals: local_assigns
 - else
   - show_builder.fields.each do |field|
     tr

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

@@ -1,11 +1,12 @@
 - if tmpl = admin_partial_name(table_builder)
-  = render tmpl
+  = render partial: tmpl, locals: local_assigns
 - else
   table.table.table-striped.index_table#list
     thead
       tr.pjax_links
         = batch_action_toggle
         th= list_sort_link(:id)
+        th.actions_panel
         - table_builder.fields.each do |field|
           th class=('hide_cell' if field.options[:hidden])
             - if field.options[:sortable] && !field.options[:image]
@@ -16,13 +17,13 @@
                 = list_sort_link field.name, opts
             - else
               = field.name.is_a?(Symbol) ? ha(field.name) : field.name
-        th= t 'admin.table.actions'
     tbody
       - is_edit_link = manager.actions.include?(:edit)
       - collection.each do |item|
         tr id=dom_id(item, 'list') class=(table_builder.options[:row_class].call(item) if table_builder.options[:row_class])
           = batch_action_item(item)
           td= id_link(item, edit: is_edit_link)
+          = item_index_actions_panel(item)
           - table_builder.fields.each do |field|
             td
               - if field.options[:editable] && field.data.is_a?(Symbol)
@@ -31,4 +32,3 @@
                 = item_image_link(item, assoc: field.name)
               - else
                 = admin_pretty_data call_method_or_proc_on(item, field.data)
-          td.actions= item_index_actions(item)

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

@@ -12,7 +12,7 @@
     .btn-group.pjax_links
       - button_scopes.each do |name, opts|
         - active = params[opts[:as]]
-        a.btn href=url_for(opts[:as] => (active ? nil : 1)) class=('active' if active) = t "admin.scopes.#{name}"
+        a.btn href=url_for(opts[:as] => (active ? nil : 1)) class=('active' if active) = t "admin.scopes.#{name}", default: name
 
   a.btn.pull-left#columns_hider_show href="#columns_hider" data-toggle='modal' = t 'admin.columns_hider.button'
 

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

@@ -2,7 +2,7 @@
   ul.nav.nav-tabs
     - Globalize.available_locales.each_with_index do |l, i|
       li class=('active' if i.zero?)
-        a data-toggle="tab" href="##{l}" class="ico_#{l}" = t("admin.langs.#{l}")
+        a data-toggle="tab" href="##{l}" class="ico_#{l}" = t("admin.langs.#{l}", default: l.to_s)
   .tab-content
     - Globalize.available_locales.each_with_index do |l, i|
       .tab-pane id=l class="tab_#{l} #{'active' if i.zero?}" = loc_html[l]

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

@@ -3,6 +3,7 @@ table.table.table-striped.index_table#list
     tr.pjax_links
       = batch_action_toggle
       th= list_sort_link(:id)
+      th.actions_panel
       th= list_sort_link(:email)
       th= ha :avatar
       th= list_sort_link(:user_role_id)
@@ -11,12 +12,16 @@ table.table.table-striped.index_table#list
       th= list_sort_link(:phone)
       th= list_sort_link(:skype)
       th= list_sort_link(:created_at)
-      th=t 'admin.table.actions'
   tbody
     - collection.each do |item|
       tr
         = batch_action_item(item)
         td= id_link(item)
+        = item_index_actions_panel(item) do
+          - if item.active?
+            = link_to t('admin.actions.suspend.link'), suspend_admin_user_path(item), method: :post, class: 'btn btn-warning'
+          - else
+            = link_to icon('ok', true), activate_admin_user_path(item), method: :post, class: 'btn btn-success', title: t('admin.actions.activate.link')
         td= mail_to item.email
         td= item_image_link(item, assoc: :avatar)
         td= item.user_role_type.try(:title)
@@ -24,10 +29,4 @@ table.table.table-striped.index_table#list
         td= item.last_name
         td= item.phone
         td= skype_link item.skype
-        td= pretty_data item.created_at
-        td.actions
-          = item_index_actions(item)
-          - if item.active?
-            = link_to t('admin.actions.suspend.link'), suspend_admin_user_path(item), method: :post, class: 'btn btn-warning'
-          - else
-            = link_to icon('ok', true), activate_admin_user_path(item), method: :post, class: 'btn btn-success', title: t('admin.actions.activate.link')
+        td= pretty_data item.created_at

data/app/views/layouts/admin/application.html.slim

@@ -9,7 +9,7 @@ html id="controller_#{controller_name}"
     = javascript_include_tag 'ab_admin/application'
     = csrf_meta_tags
     = yield(:head)
-  body id="action_#{action_name}" class="resource_#{resource_collection_name}"
+  body id="action_#{action_name}" class="resource_#{resource_collection_name} #{AbAdmin.body_css_class}"
     #wrap
       = render 'layouts/admin/navigation'
       #main role="main"

data/lib/ab_admin.rb

@@ -132,6 +132,8 @@ module AbAdmin
   mattr_accessor :site_name
   @@site_name = 'AbAdmin'
 
+  mattr_accessor :body_css_class
+
   mattr_accessor :devise_layout
   @@devise_layout = 'admin/devise'
 

data/lib/ab_admin/concerns/utilities.rb

@@ -68,12 +68,17 @@ module AbAdmin
               end
             end
             add_cond << "#{assoc.klass.quoted_table_name}.#{assoc.type} = '#{name}'" if assoc.type
-            add_cond += assoc.klass.instance_exec(&assoc.scope).where_values.map(&:to_sql) if assoc.scope
+            add_cond << assoc.klass.instance_exec(&assoc.scope).to_sql[/WHERE(.*?)(?:(?:ORDER|LIMIT).*)?$/, 1] if assoc.scope
+            if assoc.klass.default_scopes.present?
+              assoc.klass.default_scopes.each do |scope|
+                add_cond << scope.call.to_sql[/WHERE(.*?)(?:(?:ORDER|LIMIT).*)?$/, 1]
+              end
+            end
             count_klass = assoc_count.klass
             query = <<-SQL
                 UPDATE #{quoted_table_name} SET #{col} = (SELECT COUNT(#{count_klass.quoted_table_name}.id)
                   FROM #{count_klass.quoted_table_name} #{add_from}
-                  WHERE #{quoted_table_name}.id = #{count_klass.quoted_table_name}.#{assoc_count.foreign_key} AND #{add_cond.join(' AND ')})
+                  WHERE #{quoted_table_name}.id = #{count_klass.quoted_table_name}.#{assoc_count.foreign_key} AND #{add_cond.reject(&:blank?).join(' AND ')})
             SQL
             connection.execute(query)
           end

data/lib/ab_admin/engine.rb

@@ -18,6 +18,7 @@ module AbAdmin
         ActiveRecord::Base.send :extend, AbAdmin::Concerns::Silencer
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Validations
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Fileuploads
+        ActiveRecord::Base.send :extend, EnumField::EnumeratedAttribute
       end
 
       ActiveSupport.on_load :action_mailer do

data/lib/ab_admin/models/user.rb

@@ -32,7 +32,7 @@ module AbAdmin
       end
 
       def activate!
-        confirm! unless confirmed?
+        confirm unless confirmed?
         unlock_access! if access_locked?
       end
 

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -158,6 +158,17 @@ module AbAdmin
         end
       end
 
+      def item_index_actions_panel(item)
+        content = "#{item_index_actions(item)}#{capture{yield item} if block_given?}"
+        <<-HTML.html_safe
+          <td class="actions_panel">
+            <div class="actions_panel-wrap_outer">
+              <div class="actions_panel-wrap_inner">#{content}</div>
+            </div>
+          </td>
+        HTML
+      end
+
       def item_index_actions(item)
         actions = resource_action_items.map do |act|
           short_action_link(act, item)

data/lib/ab_admin/views/search_form_builder.rb

@@ -72,7 +72,7 @@ module AbAdmin
           opts = [['=', 'eq'], ['>', 'gt'], ['<', 'lt']].map { |m| [m[0], "#{attr}_#{m[1]}"] }
           current_filter = (opts.detect { |m| params[:q][m[1]].present? } || opts.first)[1]
           select_tag('', options_for_select(opts, current_filter), class: 'input-small predicate-select') +
-          text_field_tag("q[#{current_filter}]", params[:q][current_filter], class: 'input-small')
+          text_field_tag("q[#{current_filter}]", params[:q][current_filter], class: 'input-small', type: :number)
         end
       end
 
@@ -89,11 +89,11 @@ module AbAdmin
       end
 
       def presence_field(attr, options={})
-        yes_no_field(attr, {yes: %w(present 1), no: %w(present 0)}, options)
+        yes_no_field(attr, options.merge(predicates: {yes: %w(present 1), no: %w(present 0)}))
       end
 
       def null_field(attr, options={})
-        yes_no_field(attr, {yes: %w(null 0), no: %w(null 1)}, options)
+        yes_no_field(attr, options.merge(predicates: {yes: %w(null 0), no: %w(null 1)}))
       end
 
 
@@ -134,9 +134,8 @@ module AbAdmin
         end
       end
 
-      private
-
-      def yes_no_field(attr, predicates, options={})
+      def yes_no_field(attr, options={})
+        predicates = options[:predicates]
         content_tag(:div, class: 'pull-left') do
           content_tag(:label, class: 'checkbox inline') do
             param = "#{attr}_#{predicates[:yes][0]}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -364,16 +364,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.19
 description: Simple and real-life tested Rails::Engine admin interface
 email:
 - leschenko.al@gmail.com