ab_admin 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07cf0aa2ce7c13f970015d489ec04b5d6bbb3e99
-  data.tar.gz: 568de144f99ceb62940e015ee41379ce70d76002
+  metadata.gz: aaedc8d3ac86c03428e71248fb4dcd4d21f04627
+  data.tar.gz: 184c8970705793cb444da77d63d9d96b7f7952fb
 SHA512:
-  metadata.gz: 4cb44209d391674ea609b3a3b154d1103f3bbcf56aed44f3f13a6f5a06a176f2189c17ad4fd65f7a9bf5325e542c9d6c2794b7411b11cf769dda97fd0fc0f5d1
-  data.tar.gz: 426d9d87810a841b6b04b2429d26ba548aae20e8f5e59f38224707d54c57affadf38d1533d5d307b96ac58b72f85e4fc90140cf756a718a202acafc235fda562
+  metadata.gz: beb13940643e8e8480cf0cd61b3071722b7ce2fef2cb15669b52bd7e335276d3a565679f002ac619259c9cdb16d24a0e34a449da973d2204233798b0eecaff14
+  data.tar.gz: be2111af7a9ebb8462c57acc04f8d66b94b0d96dd42fa26c6bf01f5a5f4114e5013c221daa24b09c2db2fae6e93c5ce173936ee6e55a11e5d0e3e06a50575e9d

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

@@ -18,6 +18,10 @@ class window.AdminAssets extends BaseAssets
       [file.name, "<b>#{file.error}</b>"].join(' - ')).join('<br/>')
     bootbox.alert("<h3>#{errors}</h3>")
 
+  initDisabled: ->
+    super
+    @initFancybox() if $.fn.fancybox
+
   initHandlers: ->
     super
     @initFancybox() if $.fn.fancybox
@@ -25,7 +29,7 @@ class window.AdminAssets extends BaseAssets
     @initEditMeta() if @options.edit_meta
 
   initFancybox: =>
-    @list.find(" a.fancybox")
+    @list.find("a.fancybox")
       .click (e) ->
         e.preventDefault()
       .fancybox
@@ -48,7 +52,7 @@ class window.AdminAssets extends BaseAssets
         bootbox.dialog(data, [
           {label: I18n.t('admin.js.cancel'), class: ' '},
           {label: I18n.t('admin.js.save'), class: 'btn-primary btn-large fileupload-edit-submit', callback: -> $('form.fileupload-edit-form').submit()}
-        ])
+        ], {animate: false})
         max_h = $(window).height() - 100
         $('.bootbox.modal').css
           height: max_h

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

@@ -3,6 +3,15 @@ class window.BaseAssets
     @el = $('#' + @options.container_id)
     @el.data('assets', this)
     @list = @el.find('.fileupload-list')
+    if @options.disabled
+      @initDisabled()
+    else
+      @initEnabled()
+
+  initDisabled: ->
+    @el.find('.destroy_asset, .rotate_image, .main_image').hide()
+
+  initEnabled: ->
     @files_in_progress = 0
     @template = Handlebars.compile($("##{@options.asset_template}_template").html())
     @initFileupload()

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

@@ -85,7 +85,7 @@ class window.GeoInput
     marker_defaults =
       position: @point,
       map: @map,
-      draggable: true
+      draggable: !@options.disabled
 
     @options.marker_options ||= {}
     _.defaults(@options.marker_options, marker_defaults)

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

@@ -42,3 +42,9 @@ $(document).on 'admin:init', (e) ->
         withCredentials: true
       headers:
         Accept: 'application/json'
+$ ->
+  _.each $('.editable'), (el) ->
+    $el = $(el)
+    return unless $el.data('type') == 'select2'
+    options = new window.Select2Bridge($el, false).buildOptions()
+    $el.data('select2', options)

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

@@ -1,9 +1,9 @@
 class window.Select2Bridge
-  constructor: (@el) ->
+  constructor: (@el, init = true) ->
     return if fv.test && !fv.enable_fancy_select
     @el.prop('required', null)
     @modal = $('#modal_form')
-    @el.select2 @buildOptions()
+    @el.select2(@buildOptions()) if init
     @initHandlers()
     @initSortable() if @el.data('sortable')
 

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

@@ -5,19 +5,46 @@ $ ->
       checked = $(this).is(":checked")
       $("#list [name='#{input_name}[]']").attr "checked", checked
       $('#list tbody tr').toggleClass('active_row', checked)
+      $('#list').data('lastChecked', null) unless checked
 
-    $(document).on 'click', '#list input.batch_check', ->
-      $(this).closest('tr').toggleClass('active_row')
+    $(document).on 'click', '#list input.batch_check', (e) ->
+      $el = $(this).closest('tr')
+      $wrap = $('#list')
+      if $el.hasClass('active_row')
+        $wrap.data('lastChecked', null)
+        $el.removeClass('active_row')
+      else
+        $el.addClass('active_row')
+        if e.shiftKey && $wrap.data('lastChecked')
+          $prev = $wrap.data('lastChecked')
+          idx = [$prev.index(), $el.index()].sort()
+          $items = $("#list > tbody > tr:eq(#{idx[0]})").nextUntil("#list > tbody > tr:eq(#{idx[1]})")
+          $items.addClass('active_row')
+          $items.find('> td:first input').attr('checked', true)
+        $wrap.data('lastChecked', $el)
 
-    submitBatch = (el) ->
-      if $("#list [name='#{input_name}[]']:checked")[0]
-        $el = $(el)
-        ids = $("#list [name='#{input_name}[]']:checked").map(-> $(this).val()).get()
-        action = $el.data('action')
-        $('#batch_action').val(action)
-        $form = $('#batch_action_form')
-        $form.append("<input type='checkbox' name='#{input_name}[]' checked='1' value='#{id}' style='display:none;'/>") for id in ids
-        $form.submit()
+    batchIds = ->
+      $("#list [name='#{input_name}[]']:checked").map(-> $(this).val()).get()
+
+    idsInputs = ->
+      inputs = ''
+      for id in batchIds()
+        inputs += "<input type='checkbox' name='#{input_name}[]' checked='1' value='#{id}' style='display:none;'/>"
+      $(inputs)
+
+    submitBatch = (el, $extraData = null) ->
+      return unless batchIds().length
+      $el = $(el)
+      action = $el.data('action')
+      $('#batch_action').val(action)
+      $form = $('#batch_action_form')
+      $idsInputs = idsInputs()
+      $form.append($idsInputs)
+      $form.append($extraData)
+      $form.submit()
+      $.fancybox.close()
+      $extraData?.remove()
+      $idsInputs.remove()
 
     $(document).on 'click', '#list > tbody > tr', (e) ->
       return true unless _.include(['TR', 'TD'], e.target.tagName)
@@ -29,5 +56,18 @@ $ ->
         $el.find('td:first input').attr 'checked', (i, v) -> !v
 
     $(document).on 'click confirm:success', '.batch_action_link', (e) ->
+      return unless batchIds().length
+      e.preventDefault()
+      $el = $(this)
+      if $el.data('form')
+        $form = $($el.data('form'))
+        unless $form.find('.js-batch_form_submit').length
+          $form.append("<div class='btn btn-primary js-batch_form_submit' data-form=#{$el.data('form')} data-action=#{$el.data('action')}><i class='icon-ok icon-white'></i></div>")
+          $form.append("<div class='btn' onclick='$.fancybox.close()'><i class='icon-remove'></i></div>")
+        $.fancybox($form)
+      else
+        submitBatch(this)
+
+    $(document).on 'click', '.js-batch_form_submit', (e) ->
       e.preventDefault()
-      submitBatch(this)
+      submitBatch(this, $($(this).data('form')).find('input,textarea,select').clone())

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

@@ -8,6 +8,8 @@
 #= require ab_admin/core/columns_hider
 #= require ab_admin/core/view_layout
 
+$.fx.off = true if fv.test
+
 $ ->
   $(document).on 'admin:init', (e) ->
     clonePagination()

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

@@ -1,5 +1,6 @@
-window.toggleLoading = (is_loading=true) ->
-  $('#loading').toggle(is_loading)
+window.toggleLoading = (isLoading=true) ->
+  $('#loading').toggle(isLoading)
+  $.rails.enableFormElements($('#search_form')) unless isLoading
 
 $ ->
   $(document).on 'click', '.pjax, .pagination a, .pjax_links a', (e) ->

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

@@ -23,13 +23,12 @@ window.initAcFileds = ->
       width: 220
 
 window.initTooltip = ->
-  $('.do_tooltip').tooltip
+  $('.js-tooltip').tooltip
     animation: false
-    placement: 'right'
 
-window.initEditor = ->
+window.initEditor = (baseSelector='form') ->
   return if fv.test
-  $('form .do_wysihtml5').each ->
+  $("#{baseSelector} .do_wysihtml5").each ->
     $el = $(this)
     return if $el.hasClass('wysihtml5_done')
     editor = $el.wysihtml5({html: true, locale: 'ru'}).data('wysihtml5').editor

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.scss

@@ -70,6 +70,10 @@ img {
   margin-left: 20px;
 }
 
+.control-group.ckeditor textarea {
+  max-width: none;
+}
+
 ul.nav li.dropdown:hover ul.dropdown-menu {
   display: block;
   margin: 0;

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

@@ -27,3 +27,7 @@
   }
   margin: 20px 0;
 }
+
+.colored_tabs {
+  @include colored_tabs(#999);
+}

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

@@ -72,12 +72,12 @@ input[type="color"],
   .input-large      { width: 210px; }
   .input-xlarge     { width: 270px; }
   .input-xxlarge    { width: 530px; }
+  textarea.cke_source {
+    max-width: none;
+  }
 }
 
 #search_form {
-  select.input-small {
-    margin-right: 30px;
-  }
   .right-label {
     padding: 5px 0 0 130px;
   }
@@ -87,6 +87,39 @@ input[type="color"],
   label {
     margin-top: 5px;
   }
+  .string input {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 13px 4px;
+  }
+  .number .controls {
+    select {
+      float: left;
+    }
+    input {
+      float: right;
+    }
+  }
+  .date .controls {
+    text-align: center;
+    line-height: 2.3;
+    input:first-child {
+      float: left;
+    }
+    input {
+      float: right;
+    }
+  }
+  .select select {
+    width: 100%;
+  }
+  .tooltip.left {
+    -moz-transform: translateX(-10px) translateY(-4px);
+    -ms-transform: translateX(-10px) translateY(-4px);
+    -o-transform: translateX(-10px) translateY(-4px);
+    -webkit-transform: translateX(-10px) translateY(-4px);
+    transform: translateX(-10px) translateY(-4px);
+  }
 }
 
 .datetimepicker-bottom-left-custom {

data/app/controllers/admin/admin_comments_controller.rb

@@ -28,4 +28,8 @@ class Admin::AdminCommentsController < Admin::BaseController
   def commentable
     @commentable ||= AdminComment.find_resource(params[:resource_type], params[:resource_id])
   end
+
+  def permitted_params
+    params[:admin_comment].try!(:permit, :body, :resource_id, :resource_type, *AbAdmin.default_permitted_params)
+  end
 end

data/app/controllers/admin/assets_controller.rb

@@ -7,7 +7,7 @@ class Admin::AssetsController < ApplicationController
   respond_to :json
 
   def create
-    @asset = build_asset(params[:asset])
+    @asset = build_asset(permitted_params)
     @asset.guid = params[:guid]
     @asset.data = prepared_data
     @asset.user = current_user
@@ -52,6 +52,10 @@ class Admin::AssetsController < ApplicationController
 
   protected
 
+  def permitted_params
+    params[:asset].try!(:permit, :data, :is_main, :original_name, :base_filename, *Asset.all_translated_attribute_names)
+  end
+
   def find_asset
     @asset = Asset.find(params[:id])
   end
@@ -85,5 +89,4 @@ class Admin::AssetsController < ApplicationController
       end
     end
   end
-
 end

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?, :max_per_page
+                :normalized_index_views, :current_index_view, :pjax?, :xhr?, :max_per_page, :params_for_links
 
   rescue_from ::CanCan::AccessDenied, with: :render_unauthorized
 
@@ -31,13 +31,13 @@ class Admin::BaseController < ::InheritedResources::Base
       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')
+        send_data(doc.render, filename: doc.filename, type: Mime[:csv], disposition: 'attachment')
       end
-      if defined?(Mime::XLSX)
-        format.xls do
+      if Mime[:xlsx]
+        format.xlsx 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')
+          send_data(doc.render, filename: doc.filename, type: Mime[:xlsx], disposition: 'attachment')
         end
       end
     end
@@ -95,10 +95,17 @@ class Admin::BaseController < ::InheritedResources::Base
     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)
-        collection.each { |item| track_action!("batch_#{batch_action}", item) } if settings[:history]
+        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) ? c + 1 : c }
+        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)
@@ -110,6 +117,14 @@ class Admin::BaseController < ::InheritedResources::Base
 
   protected
 
+  def build_resource_params
+    permitted_params || params[resource_class.model_name.param_key]
+  end
+
+  def params_for_links
+    params.slice(:q, :s, :model_name, :per_page, :page).permit!
+  end
+
   def respond_to_format?(format)
     self.class.mimes_for_respond_to[format]
   end
@@ -121,18 +136,18 @@ class Admin::BaseController < ::InheritedResources::Base
     options
   end
 
-  def apply_batch_action(item, batch_action)
-    success = item.send(batch_action)
+  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
   end
 
   def allow_batch_action?(batch_action)
-    resource_class.batch_actions.include?(batch_action)
+    batch_action_list.detect { |a| a.name == batch_action }
   end
 
   def redirect_to_back_or_root
-    redirect_to request.env['HTTP_REFERER'] ? :back : admin_root_path
+    redirect_back fallback_location: admin_root_path
   end
 
   def track_action(key=nil, item=nil)
@@ -147,6 +162,10 @@ class Admin::BaseController < ::InheritedResources::Base
     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
@@ -165,7 +184,7 @@ class Admin::BaseController < ::InheritedResources::Base
     track_action if settings[:history]
   end
 
-  def interpolation_options
+  def flash_interpolation_options
     return {} if collection_action? || resource.errors.empty?
     {errors: resource.errors.full_messages.map { |m| "<br/> - #{m}" }.join.html_safe}
   end
@@ -217,8 +236,16 @@ class Admin::BaseController < ::InheritedResources::Base
     %w(index search batch rebuild).include?(action_name)
   end
 
+  def self.scope(name, options={})
+    has_scope name, options.without(:badge)
+    options[:badge] = {} if options[:badge] && !options[:badge].is_a?(Hash)
+    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 }.to_h
+    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
@@ -252,13 +279,17 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def search_collection
-    params[:q] ||= {}
+    query = params[:q].try!{|q| q.permit!.to_h } || {}
     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)
+    query[:s] ||= settings[:default_order] || ('id desc' unless nested)
+    @search = with_scopes(end_of_association_chain.accessible_by(current_ability).admin).ransack(query.no_blank)
     @search.result(distinct: @search.object.joins_values.present?)
   end
 
+  def with_scopes(relation)
+    relation
+  end
+
   def collection
     @collection ||= begin
       result = search_collection
@@ -339,7 +370,6 @@ class Admin::BaseController < ::InheritedResources::Base
     end
   end
 
-  # utility methods
   def pjax?
     request.headers['X-PJAX']
   end
@@ -348,7 +378,6 @@ class Admin::BaseController < ::InheritedResources::Base
     request.xhr?
   end
 
-  # user role logic
   def moderator?
     user_signed_in? && current_user.moderator?
   end
@@ -369,34 +398,14 @@ class Admin::BaseController < ::InheritedResources::Base
     raise CanCan::AccessDenied unless admin?
   end
 
-  def bind_current_user(*args)
+  def bind_current_user(*)
     resource.user_id = current_user.id if !settings[:skip_bind_current_user] && resource.respond_to?(:user_id)
   end
 
-  def bind_current_updater(*args)
+  def bind_current_updater(*)
     resource.updater_id = current_user.id if !settings[:skip_bind_current_updater] && resource.respond_to?(:updater_id)
   end
 
-  # roles logic
-  def role_given?
-    fetch_role
-  end
-
-  def as_role
-    {as: fetch_role}
-  end
-
-  def get_role
-    return [:default, :moderator, :admin] if admin?
-    return [:default, :moderator] if moderator?
-    nil
-  end
-
-  def fetch_role
-    return @as_role if defined?(@as_role)
-    @as_role = get_role
-  end
-
   def get_subject
     params[:id] ? resource : resource_class
   end