ab_admin 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce9c95c69fe8e4cb07758d71225cfb377274ced
-  data.tar.gz: b7f96a49bccb158542018212f2098a4ab69d36b6
+  metadata.gz: 950054e682380c39155c5f4f1fb1727242ffe375
+  data.tar.gz: 399c85e16c87b277a2f360eaeb4fb1dae08e2c8e
 SHA512:
-  metadata.gz: 19d5aa9eb7421200d0c64c1300c96d094a7345f1270e87adca60b7750254c5429ca9071a85a6a3c7334f0d0dc38d5fe52eccda6de3163813e71c9efc0d377385
-  data.tar.gz: 81dc3ac75c26b89e13626bc46cf072db406e98da0d524aa3b0add79f42169ed899b7ce48767fd4f1c09e96b8539b37e6bd9793098dca5fce21d37f64a3a26c82
+  metadata.gz: 5d98d2191b2c4b2178f22766d32f248101408f6ed6ee515aa0d5bcd8ae0700a28a9934fe36bc1d9c779459b1084cd137f6e7bb8fdd8106e7e44f09acd0a78e2f
+  data.tar.gz: 95545153ff5019b13e296e08287d50d6a6d1d55c886ac33edab38c385daa7f3c336b8035b63c45388670af508dc42e5dc9cb036e17b047809d328acca00ca432

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

@@ -1,18 +1,22 @@
 EditableForm = $.fn.editableform.Constructor
 EditableForm.prototype.saveWithUrlHook = (value) ->
-  url = @options.url
+  originalUrl = @options.url
   @options.url = (params) =>
-    params[@options.model] ||= {}
-    params[@options.model][params.name] = value
-    ajax_opts =
-      url: url
-      data: params
-      type: 'PATCH'
-      dataType: 'json'
-    delete params.name
-    delete params.value
-    delete params.pk
-    $.ajax $.extend(ajax_opts, @options.ajaxOptions)
+    if typeof originalUrl == 'function'
+      originalUrl.call(@options.scope, params)
+    else
+      params[@options.model] ||= {}
+      params[@options.model][params.name] = params.value
+      params._method = 'PATCH'
+      ajax_opts =
+        url: originalUrl
+        data: params
+        type: 'POST'
+        dataType: 'json'
+      delete params.name
+      delete params.value
+      delete params.pk
+      $.ajax $.extend(ajax_opts, @options.ajaxOptions)
   @saveWithoutUrlHook(value)
 EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
 EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
@@ -22,8 +26,19 @@ $(document).on 'admin:init', (e) ->
     onblur: 'submit'
     placement: 'bottom'
     emptytext: I18n.lookup('admin.js.empty') || 'Empty'
+    error: (response, newValue) ->
+      log response
+      if response.status == 422
+        flash JSON.parse(response.responseText).errors.join(', ')
+      else
+        response.responseText
     datetimepicker:
       format: "dd.mm.yyyy hh:ii"
       autoclose: true
       todayBtn: true
       language: I18n.locale
+    ajaxOptions:
+      xhrFields:
+        withCredentials: true
+      headers:
+        Accept: 'application/json'

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

@@ -8,8 +8,15 @@ class window.Select2Bridge
     @initSortable() if @el.data('sortable')
 
   initHandlers: ->
-    @el.select2('container').on 'click', '.select2-choices a', (e) ->
+    @el.select2('container').on 'click', '.select2-choices a', (e) =>
       e.stopPropagation()
+      $el = $(e.currentTarget)
+      if $el.data('remote')
+        e.preventDefault()
+        @modal.data('target', this)
+        fn = =>
+          @runModal()
+        $.get $el.attr('href'), {modal: true}, fn, 'script'
 
   buildOptions: ->
     @options = _.defaults(@el.data('select2_opts') || {},  @defaults())
@@ -18,15 +25,27 @@ class window.Select2Bridge
     if @el.data('tags')
       @options.tokenSeparators = [',']
       @options.tags = @el.data('tags')
+    if @el.data('data')
+      data = @el.data('data')
+      data = _.map(data, (el) -> {id: el, text: el.toString()} ) if data[0] && !_.isObject(data[0])
+      @options.data = data
     else if @el.data('collection')
       @options.data = @el.data('collection')
     else if @el.data('class')
       @initAjaxInput()
     if @el.data('add')
-      @initCreateChoiseOnce()
-      @initCreateChoise()
+      @initCreateChoiceOnce()
+      @initCreateChoice()
+    if @el.data('create-search-choice')
+      @options.createSearchChoice = (term) ->
+        log 'createSearchChoice'
+        {id: term, text: term}
     @options
 
+  runModal: ->
+    @el.trigger('select2.modal_open')
+    @modal.modal()
+
   initSortable: ->
     @el.select2('container').find('ul.select2-choices').sortable
       containment: 'parent'
@@ -35,43 +54,43 @@ class window.Select2Bridge
       update: =>
         @el.select2 'onSortEnd'
 
-  initCreateChoise: ->
+  initCreateChoice: ->
     @options.createSearchChoice = (term, data) =>
-      @clearCreateChoise()
+      @clearCreateChoice()
       @cont = @el.select2('container')
-      @btn_add = $("<div class='btn btn-info btn-mini select2-create-choise'>#{I18n.t('admin.js.add')} - #{term}</div>")
+      @btn_add = $("<div class='btn btn-info btn-mini select2-create-choice'>#{I18n.t('admin.js.add')} - #{term}</div>")
       @btn_add.prependTo @cont
       @btn_add.click =>
         @modal.data('target', this)
         fn = =>
           $('#modal_form form input[name$="[name]"]').val(term)
-          @modal.modal()
+          @runModal()
         $.get @el.data('add'), {modal: true}, fn, 'script'
       null
 
-  initCreateChoiseOnce: ->
-    return if Select2Bridge.initedCreateChoiseOnce
+  initCreateChoiceOnce: ->
+    return if Select2Bridge.initedCreateChoiceOnce
     @modal.on 'ajax:success', 'form', =>
       @modal.modal('hide')
       that = @modal.data('target')
-      new_item = window.ab_admin_last_created
-      that.addItem(new_item)
-      that.clearCreateChoise()
+      item = window.ab_admin_last_created || window.ab_admin_last_updated
+      that.addItem(item)
+      that.clearCreateChoice()
       @el.data("select2-change-triggered", true)
-      @el.trigger('change', [new_item])
+      @el.trigger('change', [item])
       @el.data("select2-change-triggered", false)
-    Select2Bridge.initedCreateChoiseOnce = true
+    Select2Bridge.initedCreateChoiceOnce = true
 
   addItem: (item) ->
     if @el.data('select2').opts.multiple
-      data = @el.select2('data')
+      data = _.reject(@el.select2('data'), (i) -> i.id == item.id)
       data.push item
       @el.select2('data', data)
     else
       @el.select2('data', item)
 
-  clearCreateChoise: ->
-    @el.select2('container').children('.select2-create-choise').remove()
+  clearCreateChoice: ->
+    @el.select2('container').children('.select2-create-choice').remove()
 
   defaults: ->
     opts =
@@ -80,12 +99,12 @@ class window.Select2Bridge
       placeholder: ' '
       allowClear: true
       escapeMarkup: (m) -> m
-    opts.minimumResultsForSearch = 10 unless fv.test || @el.data('add')
+    opts.minimumResultsForSearch = 10 unless fv.test || @el.data('add') || @el.data('create-search-choice')
     opts
 
   initAjaxInput: ->
     if @el.data('image')
-      @buildimageOptions()
+      @buildImageOptions()
     if @el.data('result')
       @options.formatResult = (item) => fetchTemplate(@el.data('result'))(item)
     if @el.data('selection')
@@ -105,7 +124,7 @@ class window.Select2Bridge
         results: data
         more: data.length > 0
 
-  buildimageOptions: ->
+  buildImageOptions: ->
     @options.formatResult = (item) ->
       html = '<div class="fancy_select-result">'
       html += "<img src='#{item.image}' alt='#{item.text}'>" if item.image

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

@@ -3,7 +3,8 @@ class window.ColumnsHider
     @store_key = 'cols'
     @data_el = $('#columns_hider_data')
     @column_names = @columnNames()
-    @collection_name = $('html').attr('id').replace(/^controller_/, '')
+    @collection_name = window.location.href.match(/admin\/(\w+)/)?[1]
+    return unless @collection_name
     @data = @getData()
     @initDefaults()
     @initButtons()
@@ -32,9 +33,6 @@ class window.ColumnsHider
         data[@collection_name].push(i) if col.disabled
     data
 
-  fetchData: ->
-    window.localStorage?[@store_key] or $.cookie(@store_key)
-
   initButtons: ->
     @data_el.empty()
     for col, i in @column_names
@@ -62,6 +60,7 @@ class window.ColumnsHider
       @showAll()
       for i in @data[@collection_name]
         @hideByIndex(i + 1)
+      $(document).trigger('admin:refresh_columns')
 
   hideByIndex: (i) ->
     $("#list > thead > tr > th:nth-child(#{i}), #list > tbody > tr > td:nth-child(#{i})").hide()
@@ -70,4 +69,4 @@ class window.ColumnsHider
     $("#list > thead > tr > th, #list > tbody > tr > td").show()
 
 $ ->
-  window.columns_hider = new ColumnsHider()
+  window.columns_hider = new ColumnsHider()

data/app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee

@@ -6,10 +6,10 @@ $ ->
       todayBtn: true
       language: I18n.locale
 
-    search_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
-    $('#search_form input.datepicker').datetimepicker search_options
+    search_form_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
+    $('#search_form input.datepicker').datetimepicker search_form_options
 
-    date_picker_options = _.defaults({format: "dd.mm.yyyy"}, base_options)
+    date_picker_options = _.defaults({format: "dd.mm.yyyy", minView: 2}, base_options)
     $('.simple_form input.date_picker').datetimepicker date_picker_options
 
     $('.simple_form input.datetime_picker').datetimepicker base_options

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

@@ -16,7 +16,6 @@ $baseLineHeight: 18px !default;
 @import "ab_admin/components/perms";
 @import "ab_admin/components/admin_comments";
 @import "ab_admin/components/geo_input";
-@import "ab_admin/components/text_styles";
 @import "ab_admin/components/view_layout";
 @import "ab_admin/components/columns_hider";
 
@@ -24,6 +23,10 @@ img {
   max-width: none;
 }
 
+.thumbnail.active {
+  @extend a.thumbnail:hover
+}
+
 .pagination a {
   background-color: white;
 }
@@ -106,6 +109,7 @@ ul.nav li.dropdown:hover ul.dropdown-menu {
   margin-bottom: 5px;
   .nav > li > a {
     color: #f5f5f5;
+    display: inline-block;
   }
   .nav .active > a, .nav .active > a:hover {
     color: #f5f5f5;

data/app/assets/stylesheets/ab_admin/components/_columns_hider.css.scss

@@ -1,5 +1,5 @@
 #columns_hider {
-  .btn-group.btn {
+  .btn-group .btn {
     float: left;
   }
 }

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

@@ -131,7 +131,7 @@ textarea {
   max-height: 500px;
 }
 
-.select2-create-choise {
+.select2-create-choice {
   margin-left: 10px;
 }
 

data/app/controllers/admin/assets_controller.rb

@@ -61,7 +61,10 @@ class Admin::AssetsController < ApplicationController
   end
 
   def prepared_data
-    params[:data].original_filename = "blob.#{params[:data].content_type.split('/').last}" if params[:data].original_filename == 'blob'
+    if %w(blob undefined).include? params[:data].original_filename
+      extension = params[:data].content_type.split('/').last
+      params[:data].original_filename = "original.#{extension}"
+    end
     params[:data]
   end
 

data/app/controllers/admin/base_controller.rb

@@ -57,7 +57,7 @@ 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]
+      unless respond_to_format?(:json)
         success.json { head :no_content }
         failure.json { head :unprocessable }
       end
@@ -104,6 +104,10 @@ class Admin::BaseController < ::InheritedResources::Base
 
   protected
 
+  def respond_to_format?(format)
+    self.class.mimes_for_respond_to[format]
+  end
+
   def default_url_options
     options = {format: nil}
     options.update instance_exec(&AbAdmin.default_url_options) if AbAdmin.default_url_options
@@ -147,10 +151,14 @@ 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] }
+      before_save :track_current_action
     end
   end
 
+  def track_current_action(*)
+    track_action if settings[:history]
+  end
+
   def interpolation_options
     return {} if collection_action? || resource.errors.empty?
     {errors: resource.errors.full_messages.map { |m| "<br/> - #{m}" }.join.html_safe}
@@ -197,7 +205,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def button_scopes
-    self.class.button_scopes ||= self.class.scopes_configuration.except(: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 }.to_h
   end
 
   def add_breadcrumbs
@@ -232,9 +240,9 @@ class Admin::BaseController < ::InheritedResources::Base
 
   def search_collection
     params[:q] ||= {}
-    params[:q][:s] ||= 'id desc'
+    params[:q][:s] ||= settings[:default_order] || 'id desc'
     @search = end_of_association_chain.accessible_by(current_ability).admin.ransack(params[:q].no_blank)
-    @search.result(distinct: true)
+    @search.result(distinct: @search.object.joins_values.present?)
   end
 
   def collection
@@ -242,11 +250,11 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def per_page
-    return params[:per_page] if params[:per_page].present?
-    if current_index_view == 'tree'
-      params[:per_page] = 1000
+    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] = cookies[:pp] || 50
+      params[:per_page] = request_per_page
     end
   end
 
@@ -281,6 +289,8 @@ class Admin::BaseController < ::InheritedResources::Base
       new_resource_path(return_to: params[:return_to])
     elsif params[:_add_edit]
       edit_resource_path(resource, return_to: params[:return_to])
+    elsif params[:_save_and_show]
+      resource_path(resource, return_to: params[:return_to])
     elsif params[:_add_edit_next] || params[:_add_edit_prev]
       rec = resource.next_prev_by_url(end_of_association_chain.accessible_by(current_ability).unscoped.base, params[:return_to], !!params[:_add_edit_prev])
       if rec
@@ -302,7 +312,7 @@ class Admin::BaseController < ::InheritedResources::Base
     fv.env = Rails.env
     if AbAdmin.test_env?
       fv.test = true
-      AbAdmin.test_settings.each { |k, v| fv.set_variable k, v }
+      AbAdmin.test_settings.each { |k, v| fv[k] = v }
     end
   end
 
@@ -380,4 +390,12 @@ class Admin::BaseController < ::InheritedResources::Base
     end
   end
 
+  def default_serializer_options
+    if resource_class
+      {root: resource_class.model_name.plural}
+    else
+      {root: false}
+    end
+  end
+
 end

data/app/controllers/admin/locators_controller.rb

@@ -32,7 +32,7 @@ class ::Admin::LocatorsController < ::Admin::BaseController
 
   def reload
     I18n.reload!
-    Locator.reload_checker.expire
+    Locator.reload_checker.expire if Locator.respond_to?(:reload_checker)
     flash[:notice] = I18n.t('flash.admin.locators.restart')
     redirect_to admin_locators_path
   end

data/app/controllers/admin/manager_controller.rb

@@ -92,13 +92,18 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   def manager
     @manager ||= begin
-      manager_instance = "AbAdmin#{resource_class.name}".constantize.instance
+      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
       manager_instance
     rescue NameError => e
-      raise ActionController::RoutingError.new("AbAdmin manager_model for #{resource_class.name} not found (#{e.message})")
+      if e.message.include?(manager_class_name)
+        raise ActionController::RoutingError.new("AbAdmin manager_model for #{resource_class.name} not found (#{e.message})")
+      else
+        raise
+      end
     end
   end
 

data/app/controllers/admin/static_pages_controller.rb

@@ -1,15 +1,14 @@
 class Admin::StaticPagesController < Admin::BaseController
   load_and_authorize_resource
 
-  defaults singleton: true
+  defaults singleton: true, class_name: 'Structure'
 
-  belongs_to :structure
+  belongs_to :structure, finder: :friendly_find
+
+  private
 
   def settings
     {}
   end
 
-  def parent_class
-    Structure
-  end
 end