ab_admin 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950054e682380c39155c5f4f1fb1727242ffe375
-  data.tar.gz: 399c85e16c87b277a2f360eaeb4fb1dae08e2c8e
+  metadata.gz: f4b41478c7820e45d9a9deae90db880543e42050
+  data.tar.gz: 7c53e52bcde99999c83faf3105c3f7be082176be
 SHA512:
-  metadata.gz: 5d98d2191b2c4b2178f22766d32f248101408f6ed6ee515aa0d5bcd8ae0700a28a9934fe36bc1d9c779459b1084cd137f6e7bb8fdd8106e7e44f09acd0a78e2f
-  data.tar.gz: 95545153ff5019b13e296e08287d50d6a6d1d55c886ac33edab38c385daa7f3c336b8035b63c45388670af508dc42e5dc9cb036e17b047809d328acca00ca432
+  metadata.gz: 0e43c703029a62700cf443d0460991011e5a3520569a03640d3e08afe30c59584c4fd5429bff961ce4575efb6630fa1f9fa8066b2afaf394a6298845aaf4a2a4
+  data.tar.gz: 520fbc9ebf7047fa5b9dff9ed8f433d2b15dc7e1feef02d933d5839ffe511b4fcc74b02fc2a8f0d92552cc5079b674a3443e1a86a7c5dccc3a6c06b43a3e0bae

data/README.md

@@ -7,10 +7,10 @@ Simple and real-life tested Rails::Engine admin interface based on slim, bootstr
 To build a new Rails application with AbAdmin, run:
 
 ```bash
-rails new [MyAppName] -m https://raw2.github.com/leschenko/ab_admin/master/lib/generators/template.rb
+rails new [my_app_name] -m https://raw.githubusercontent.com/leschenko/ab_admin/master/lib/generators/template.rb
 ```
 
-Or add gems from template [list of gems](https://raw2.github.com/leschenko/ab_admin/master/lib/generators/template.rb) to an existing application and run generators:
+Or add gems from template [list of gems](https://raw.githubusercontent.com/leschenko/ab_admin/master/lib/generators/template.rb) to an existing application and run generators:
 
 ```bash
 rails generate devise:install

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

@@ -16,7 +16,7 @@ class window.AdminAssets extends BaseAssets
   showErrors: (e, data) ->
     errors = _.map(data.files,(file) ->
       [file.name, "<b>#{file.error}</b>"].join(' - ')).join('<br/>')
-    bootbox.alert(errors)
+    bootbox.alert("<h3>#{errors}</h3>")
 
   initHandlers: ->
     super

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

@@ -37,3 +37,5 @@ class window.Locator
       text = $el.val().replace(/'/, '\'')
       $('#locale_data tr').hide()
       $("#locale_data td:nth-child(#{ind}):contains('#{text}')").parent().show()
+
+    $('.filter_field[value]').keyup()

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

@@ -143,26 +143,27 @@ class window.Select2Bridge
 
   fetchAjaxParams: (term, page) =>
     cond = {}
-    if @el.data('c')
+    condData = JSON.parse(@el.attr('data-c') || null)
+    if condData
       for kind in ['with', 'without']
-        if @el.data('c')[kind]
+        if condData[kind]
           cond[kind] ||= {}
-          for attr, id of @el.data('c')[kind]
+          for attr, id of condData[kind]
             value = $('#' + id).val()
             cond[kind][attr] = value if value
 
       for kind in ['with_term', 'without_term']
-        if @el.data('c')[kind]
+        if condData[kind]
           kind_key = kind.replace(/_term$/, '')
           cond[kind_key] ||= {}
-          for attr, value of @el.data('c')[kind]
+          for attr, value of condData[kind]
             cond[kind_key][attr] = value if value
 
       for kind in ['with_selector', 'without_selector']
-        if @el.data('c')[kind]
+        if condData[kind]
           kind_key = kind.replace(/_selector$/, '')
           cond[kind_key] ||= {}
-          for attr, value of @el.data('c')[kind]
+          for attr, value of condData[kind]
             selectors = value.split(/\s+/)
             value = @el.closest(selectors[1] || 'html').find(selectors[0]).val()
             cond[kind_key][attr] = value if value

data/app/assets/javascripts/ab_admin/core/confirmation.js.coffee

@@ -1,6 +1,6 @@
 $.rails.allowAction = (element) ->
   message = element.data("confirm")
   return true unless message
-  bootbox.confirm message, (answer) ->
+  bootbox.confirm "<h3>#{message}</h3>", (answer) ->
     element.data('confirm', null).click() if answer
   false

data/app/assets/javascripts/ab_admin/core/init.js.coffee

@@ -15,7 +15,7 @@ $ ->
     $(document).trigger('admin:list_init')
 
     $('.per_page').click ->
-      $.cookie('pp', $(this).data('val'))
+      $.cookie('pp', $(this).data('val'), {path: window.location.pathname})
 
     $('#list').on 'click', 'tr.list_edit .form_cancel', ->
       e.preventDefault()
@@ -39,10 +39,11 @@ $ ->
     $(document).trigger({type: 'admin:init', pjax: true})
   $(document).trigger({type: 'admin:init'})
 
-  $(document).on 'dblclick', '#list > tbody > tr', (e) ->
-    e.preventDefault()
-    unless $(e.target).closest('#list > tbody > tr > td').hasClass('list_adds')
-      $(this).find('td a.resource_id_link').toHref()
+  if window.fv?.list_dblclick
+    $(document).on 'dblclick', '#list > tbody > tr', (e) ->
+      e.preventDefault()
+      unless $(e.target).closest('#list > tbody > tr > td').hasClass('list_adds')
+        $(this).find('td a.resource_id_link').toHref()
 
   initFancySelect()
   initNestedFields()

data/app/assets/javascripts/ab_admin/core/utils.js.coffee

@@ -161,9 +161,9 @@ window.storeData = (key, data) ->
     str = JSON.stringify(data)
   else
     str = '' + data
-  if window.localStorage
+  try
     window.localStorage[key] = str
-  else
+  catch
     $.cookie(key, str, {path: '/'})
 
 window.fetchData = (key) ->

data/app/controllers/admin/base_controller.rb

@@ -21,7 +21,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items,
                 :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer,
-                :normalized_index_views, :current_index_view, :pjax?, :xhr?
+                :normalized_index_views, :current_index_view, :pjax?, :xhr?, :max_per_page
 
   rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
 
@@ -181,8 +181,15 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def settings
-    {index_view: 'table', sidebar: collection_action?, well: (collection_action? || %w(show history).include?(action_name)),
-     search: true, batch: true, hotkeys: true}
+    {
+        index_view: 'table',
+        sidebar: collection_action?,
+        well: (collection_action? || %w(show history).include?(action_name)),
+        search: true,
+        batch: true,
+        hotkeys: true,
+        list_dblclick: true
+    }
   end
 
   def action_items
@@ -246,16 +253,20 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def collection
-    @collection ||= search_collection.paginate(page: params[:page], per_page: per_page, large: true)
+    @collection ||= begin
+      result = search_collection
+      result = result.paginate(page: params[:page], per_page: per_page, large: true) if action_name != 'batch' && !settings[:skip_pagination]
+      result
+    end
   end
 
   def per_page
-    request_per_page = (params[:per_page].presence || cookies[:pp].presence).to_i
-    if request_per_page.zero?
-      params[:per_page] = current_index_view == 'tree' ? 1000 : 50
-    else
-      params[:per_page] = request_per_page
-    end
+    request_per_page = (params[:per_page].presence || cookies[:pp].presence).to_i.nonzero?
+    params[:per_page] = [request_per_page || AbAdmin.view_default_per_page[current_index_view.to_sym], max_per_page].min
+  end
+
+  def max_per_page
+    settings[:max_per_page] || AbAdmin.max_per_page
   end
 
   def set_layout
@@ -309,7 +320,12 @@ class Admin::BaseController < ::InheritedResources::Base
     fv.bg_color = current_user.bg_color
     fv.admin = admin?
     fv.hotkeys = settings[:hotkeys]
+    fv.list_dblclick = settings[:list_dblclick]
     fv.env = Rails.env
+    if resource_class.respond_to?(:model_name)
+      fv.resource_plural = resource_class.model_name.plural
+      fv.resource_singular = resource_class.model_name.singular
+    end
     if AbAdmin.test_env?
       fv.test = true
       AbAdmin.test_settings.each { |k, v| fv[k] = v }
@@ -397,5 +413,4 @@ class Admin::BaseController < ::InheritedResources::Base
       {root: false}
     end
   end
-
 end

data/app/views/admin/admin_comments/_comment.html.slim

@@ -2,7 +2,7 @@
   .span5
     strong
       - if comment.user_id
-        =' link_to comment.user_name, admin_user_path(id: comment.user_id), target: '_blank'
+        => link_to comment.user_name, admin_user_path(id: comment.user_id), target: '_blank'
     div.muted= l(comment.created_at, format: :long)
     div= comment.body
 

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

@@ -2,9 +2,8 @@
 #toggle_sidebar_on.btn.btn-large = icon('chevron-right')
 h3= t('admin.search.title')
 = search_admin_form_for @search, url: collection_path do |f|
-  - cache [I18n.locale, 'search_form_inside', resource_class.name, params[:q].hash, current_user.user_role_id] do
-    = render 'search_form', f: f
-    br
-    div
-      = f.submit t('admin.search.submit'), class: 'btn btn-success btn-large'
-      = f.submit t('admin.search.cancel'), class: 'btn', id: 'search_cancel'
+  = render 'search_form', f: f
+  br
+  div
+    = f.submit t('admin.search.submit'), class: 'btn btn-success btn-large'
+    = f.submit t('admin.search.cancel'), class: 'btn', id: 'search_cancel'

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

@@ -1,18 +1,17 @@
-/- if settings[:index_view] == 'table'
 = form_tag url_for(action: :batch), id: 'batch_action_form', class: 'pjax-form' do
   input name='batch_action' id='batch_action' type='hidden'
   = render 'admin/shared/content_actions'
     
 #content= render current_index_view
-.pagination-wrap.pull-left
-  = will_paginate collection, renderer: BootstrapPagination::Rails
-  .pagination_info= pagination_info collection
-.btn-toolbar.pull-right.pjax_links
-  .btn-group
-    - [50, 100, 500, 1000].each do |c|
-      a.btn.per_page data-val=c href=url_for(params.merge(per_page: c)) class=('active' if c == collection.per_page) = c
+- unless settings[:skip_pagination]
+  .pagination-wrap.pull-left
+    = will_paginate collection, renderer: BootstrapPagination::Rails
+    .pagination_info= pagination_info collection
+  .btn-toolbar.pull-right.pjax_links
+    .btn-group
+      - per_page_variants.each do |c|
+        a.btn.per_page data-val=c href=url_for(params.merge(per_page: c)) class=('active' if c == collection.per_page) = c
 
 - if pjax? && flash.present?
-  - flash.each do |type, message|
-    = javascript_tag %[flash("#{j message}", "#{type}")]
+  script type='text/javascript' = render partial: 'admin/shared/flash', formats: :js, local_assigns: {flash: flash}
 

data/app/views/admin/fileupload/_container.html.slim

@@ -8,7 +8,8 @@
     .fileupload-edit-button.btn.pull-left= t('admin.actions.edit.link')
 
     .fileupload-info
-      .fileupload-info-extensions= options[:extensions].join(', ')
+      - if options[:extensions]
+        .fileupload-info-extensions= options[:extensions].join(', ')
       .fileupload-info-max_size== "#{t('admin.fileupload.max_size')}: <b>#{options[:max_size]}</b> MB"
 
 = init_js("new AdminAssets(#{js_options.to_json})")

data/app/views/admin/locators/edit.html.slim

@@ -20,9 +20,9 @@ table.table.table-bordered.table-striped
       th = locale_file.locale
       th = I18n.default_locale
     tr
-      - 3.times do
+      - [:key_contains, :edit_locale_contains, :main_locale_contains].each do |param|
         th
-          input.filter_field type='text' placeholder=t('admin.locators.filter')
+          input.filter_field type='text' value=params[param] placeholder=t('admin.locators.filter')
   = form_tag(admin_locators_path, method: :put) do
     tbody#locale_data
       = hidden_field_tag 'edit_locale_name', locale_file.locale

data/app/views/admin/locators/show.html.slim

@@ -9,5 +9,5 @@ table.table.table-striped.table-bordered style='width: 1050px;'
       td= filename.to_s[/\w+/]
       td= link_to filename, edit_admin_locators_path(filename: filename)
 
-=' link_to t('admin.locators.prepare'), prepare_admin_locators_path, class: 'btn btn-warning', method: :post
-=' link_to t('admin.locators.restart'), reload_admin_locators_path, class: 'btn btn-primary', method: :post
+=> link_to t('admin.locators.prepare'), prepare_admin_locators_path, class: 'btn btn-warning', method: :post
+=> link_to t('admin.locators.restart'), reload_admin_locators_path, class: 'btn btn-primary', method: :post

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

@@ -16,11 +16,11 @@
                 = list_sort_link field.name, opts
             - else
               = field.name.is_a?(Symbol) ? ha(field.name) : field.name
-        th=t 'admin.table.actions'
+        th= t 'admin.table.actions'
     tbody
       - is_edit_link = manager.actions.include?(:edit)
       - collection.each do |item|
-        tr id=dom_id(item, 'list')
+        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)
           - table_builder.fields.each do |field|

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

@@ -21,7 +21,8 @@
 
   br
   br
-  =' submit_tag(t('admin.form.save'), class: 'btn btn-primary')
-  =' link_to t('admin.cache_clear'), cache_clear_admin_settings_path, class: 'btn btn-danger', method: :post, remote: true
+  - if collection.present?
+    => submit_tag(t('admin.form.save'), class: 'btn btn-primary')
+  => link_to t('admin.cache_clear'), cache_clear_admin_settings_path, class: 'btn btn-danger', method: :post, remote: true
 
 = init_js('$("form ul.nav-tabs li:first, form .tab-pane:first").addClass("active")')

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

@@ -25,7 +25,7 @@
       - normalized_index_views.each do |index_view|
         = index_view_link(index_view)
 
-  - if can? :export, resource_class
+  - if can?(:export, resource_class) && !settings[:skip_export]
     .btn-group.downloads
       = icon('download-alt')
       /- %w(csv xls json).each do |format|

data/app/views/admin/shared/_flash.js.erb

@@ -1,3 +1,3 @@
-<% flash.each do |k, v| %>
-  flash("<%= j v %>", "<%= k %>");
+<% flash.each do |type, message| %>
+  flash("<%= j message.html_safe %>", "<%= type %>");
 <% end unless flash.empty? %>

data/config/routes.rb

@@ -33,24 +33,24 @@ Rails.application.routes.draw do
 
     post 'translate' => AbAdmin::I18nTools::TranslateApp
 
-    controller 'manager' do
+    controller 'manager', constraints: {format: /(html|js|json|xml|csv|xls|xlsx)/} do
       scope '(/:parent_resource/:parent_resource_id)/:model_name' do
-        get '/new', to: :new, as: 'new'
-        post '/batch', to: :batch, as: 'batch'
-        post '/rebuild', to: :rebuild, as: 'rebuild'
-        match '/custom_action', to: :custom_action, as: 'collection_action', via: :all
+        get '/new', action: :new, as: 'new'
+        post '/batch', action: :batch, as: 'batch'
+        post '/rebuild', action: :rebuild, as: 'rebuild'
+        match '/custom_action', action: :custom_action, as: 'collection_action', via: :all
 
         scope ':id' do
-          get '/edit', to: :edit, as: 'edit'
-          get '/history', to: :history, as: 'history'
-          match '/custom_action', to: :custom_action, as: 'member_action', via: :all
-          get '/', to: :show, as: 'show'
-          patch '/', to: :update, as: 'update'
-          delete '/', to: :destroy, as: 'destroy'
+          get '/edit', action: :edit, as: 'edit'
+          get '/history', action: :history, as: 'history'
+          match '/custom_action', action: :custom_action, as: 'member_action', via: :all
+          get '/', action: :show, as: 'show'
+          patch '/', action: :update, as: 'update'
+          delete '/', action: :destroy, as: 'destroy'
         end
 
-        get '/', to: :index, as: 'index'
-        post '/', to: :create, as: 'create'
+        get '/', action: :index, as: 'index'
+        post '/', action: :create, as: 'create'
       end
     end
 

data/lib/ab_admin.rb

@@ -164,6 +164,19 @@ module AbAdmin
 
   mattr_accessor :base_url
 
+  mattr_accessor :default_per_page
+  @@default_per_page = 50
+
+  mattr_accessor :view_default_per_page
+  @@view_default_per_page = Hash.new { AbAdmin.default_per_page }
+  @@view_default_per_page[:tree] = 1000
+
+  mattr_accessor :max_per_page
+  @@max_per_page = Float::INFINITY
+
+  mattr_accessor :per_page_variants
+  @@per_page_variants = [50, 100, 500, 1000]
+
   extend Utils
 
   def self.setup

data/lib/ab_admin/abstract_resource.rb

@@ -1,7 +1,5 @@
 module AbAdmin
   class AbstractResource
-    #unloadable
-
     include Singleton
 
     unless self.const_defined?(:ACTIONS)
@@ -165,7 +163,5 @@ module AbAdmin
     def has_module?(module_constant)
       model.included_modules.include?(module_constant)
     end
-
   end
-
 end

data/lib/ab_admin/concerns/admin_addition.rb

@@ -6,7 +6,7 @@ module AbAdmin
       included do
         scope(:admin, -> { all }) unless respond_to?(:admin)
         scope(:base, -> { all }) unless respond_to?(:base)
-        scope :by_ids, lambda { |ids| where("#{quoted_table_name}.id IN (?)", AbAdmin.val_to_array(ids).push(0)) }
+        scope :by_ids, lambda { |ids| where("#{quoted_table_name}.id IN (?)", AbAdmin.val_to_array(ids).push(0)) } unless respond_to?(:by_ids)
 
         class_attribute :batch_actions, instance_writer: false
         self.batch_actions = [:destroy]
@@ -27,6 +27,10 @@ module AbAdmin
         "#{self.class.model_name.human(count: 1)} ##{self.id} #{AbAdmin.safe_display_name(self)}"
       end
 
+      def translated_any(attr)
+        send(attr).presence || translations.detect { |r| r.send(attr).present? }.try!(attr)
+      end
+
       def new_changes
         exclude_attrs = respond_to?(:translated_attribute_names) ? translated_attribute_names.dup : []
         exclude_attrs << :updated_at