ab_admin 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaedc8d3ac86c03428e71248fb4dcd4d21f04627
-  data.tar.gz: 184c8970705793cb444da77d63d9d96b7f7952fb
+  metadata.gz: 6ce8e9459f56af1d3d99d9879e7ff436044d8ddf
+  data.tar.gz: cbb672396e927b87745c456a0d2c00c4c448495c
 SHA512:
-  metadata.gz: beb13940643e8e8480cf0cd61b3071722b7ce2fef2cb15669b52bd7e335276d3a565679f002ac619259c9cdb16d24a0e34a449da973d2204233798b0eecaff14
-  data.tar.gz: be2111af7a9ebb8462c57acc04f8d66b94b0d96dd42fa26c6bf01f5a5f4114e5013c221daa24b09c2db2fae6e93c5ce173936ee6e55a11e5d0e3e06a50575e9d
+  metadata.gz: 16bde27cb07d0374a9a88e0d62dd4b3d6ec6146e1abe3bcb4305009cdf118eeced0d8f9d8f5c24e73ab16850971fe7dd06057174e26bc9d9832fcd4a62e8a6e4
+  data.tar.gz: b97fedf00db9ab33b7ba49e1c07d4c001096f26a5426a3b92c54f913e77fbf3e9ea79ebbd60f45556182f9ab05567c3df6af8e7ee73af11bfbc3756ab2ba3f4e

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

@@ -13,10 +13,15 @@ EditableForm.prototype.saveWithUrlHook = (value) ->
         data: params
         type: 'POST'
         dataType: 'json'
+      if @options.accept == 'script'
+        ajax_opts.dataType = @options.accept
+        ajaxOptions = $.extend(@options.ajaxOptions, {headers: {Accept: 'text/javascript, application/javascript'}})
+      else
+        ajaxOptions = @options.ajaxOptions
       delete params.name
       delete params.value
       delete params.pk
-      $.ajax $.extend(ajax_opts, @options.ajaxOptions)
+      $.ajax $.extend(ajax_opts, ajaxOptions)
   @saveWithoutUrlHook(value)
 EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
 EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
@@ -32,6 +37,9 @@ $(document).on 'admin:init', (e) ->
         flash JSON.parse(response.responseText).errors.join(', ')
       else
         response.responseText
+    success: (response) ->
+      if response && $(this).data().options?.accept == 'script'
+        $.globalEval(response.responseText)
     datetimepicker:
       format: "dd.mm.yyyy hh:ii"
       autoclose: true

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

@@ -19,7 +19,7 @@ class window.Select2Bridge
         $.get $el.attr('href'), {modal: true}, fn, 'script'
 
   buildOptions: ->
-    @options = _.defaults(@el.data('select2_opts') || {},  @defaults())
+    @options = _.defaults(@el.data('select2_opts') || @el.data('select2-opts') || {},  @defaults())
     @options.multiple = @el.data('multi') unless _.isUndefined(@el.data('multi'))
     @options.width = @el[0].style.width || 'resolve'
     if @el.data('tags')
@@ -38,7 +38,6 @@ class window.Select2Bridge
       @initCreateChoice()
     if @el.data('create-search-choice')
       @options.createSearchChoice = (term) ->
-        log 'createSearchChoice'
         {id: term, text: term}
     @options
 

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

@@ -43,15 +43,17 @@ $ ->
 
   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()
+      if e.target.tagName == 'TD'
+        e.preventDefault()
+        unless $(e.target).closest('#list > tbody > tr > td').hasClass('list_adds')
+          $(this).find('td a.resource_id_link').toHref()
 
   initFancySelect()
   initNestedFields()
   initNestedFields()
   inputSetToggle()
   inputBtnClose()
+  initEditableBool()
 
   if window.fv?.bg_color
     $('body').css('background-color', "##{window.fv.bg_color.replace(/^#/, '')}")

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

@@ -65,3 +65,20 @@ window.initFancySelect = ->
     $el = $(this)
     return if $el.data('select2')
     $el.data('Select2Bridge') or $el.data('Select2Bridge', new Select2Bridge($el))
+
+window.initEditableBool = ->
+  $(document).on 'click', '.js-auto-submit-checkbox', (e) ->
+    $el = $(this)
+    $el.attr('disabled', true)
+    $wrap = $el.closest('.auto-submit-checkbox-wrap').removeClass('success', 'error')
+    params = {}
+    params[$el.attr('name')] = if $el.prop('checked') then 1 else 0
+    params['_method'] = $el.data('method') || 'PATCH'
+    $.ajax $el.data('url'),
+      data: params
+      method: 'POST'
+      error: ->
+        $wrap.addClass('error')
+      success: ->
+        $wrap.addClass('success')
+        $el.attr('disabled', null)

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

@@ -1,15 +1,20 @@
 $ ->
   window.initPickers = ->
     base_options =
-      format: "dd.mm.yyyy hh:ii"
+      format: "yyyy-mm-dd hh:ii"
       autoclose: true
       todayBtn: true
+      viewSelect: 'month'
+      minView: 'day'
       language: I18n.locale
 
     search_form_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
-    $('#search_form input.datepicker').datetimepicker search_form_options
+    search_form_options_gt = _.defaults({initialDate: new Date(new Date().setHours(0,0,0,0))}, search_form_options)
+    search_form_options_lt = _.defaults({initialDate: new Date(new Date().setHours(23,59,59,999))}, search_form_options)
+    $('#search_form input.datepicker[name*="_at_gteq]"]').datetimepicker search_form_options_gt
+    $('#search_form input.datepicker[name*="_at_lteq]"]').datetimepicker search_form_options_lt
 
-    date_picker_options = _.defaults({format: "dd.mm.yyyy", minView: 2}, base_options)
+    date_picker_options = _.defaults({format: "yyyy-mm-dd", 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.scss

@@ -23,10 +23,6 @@ img {
   max-width: none;
 }
 
-.thumbnail.active {
-  @extend a.thumbnail:hover
-}
-
 .pagination a {
   background-color: white;
 }
@@ -70,10 +66,6 @@ img {
   margin-left: 20px;
 }
 
-.control-group.ckeditor textarea {
-  max-width: none;
-}
-
 ul.nav li.dropdown:hover ul.dropdown-menu {
   display: block;
   margin: 0;
@@ -184,4 +176,41 @@ label.control-label.label-reset {
 }
 .inline_block {
   display: inline-block;
+}
+.white-space-nowrap {
+  white-space: nowrap;
+}
+
+@media (max-width: 767px) {
+  body, .container-fluid {
+    padding: 0;
+  }
+  .content_with_sidebar {
+    padding: 10px 0;
+  }
+  .navbar-fixed-top, .navbar-fixed-bottom, .navbar-static-top {
+    margin: 0;
+  }
+  #container {
+    display: flex;
+    flex-direction: column;
+  }
+  #main {
+    .wrap_content {
+      position: static;
+      order: 2;
+      margin: 0 3px;
+      .content_with_sidebar {
+        margin: 0;
+      }
+    }
+    .sidebar {
+      position: static;
+      order: 1;
+      margin: 0 3px 5px;
+    }
+    .content_actions {
+      margin-left: 0;
+    }
+  }
 }

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

@@ -19,7 +19,7 @@ input[type="color"],
 }
 
 .simple_form {
-  input, textarea {
+  input, textarea.text {
     width: 100%;
     max-width: 600px;
   }
@@ -120,6 +120,16 @@ input[type="color"],
     -webkit-transform: translateX(-10px) translateY(-4px);
     transform: translateX(-10px) translateY(-4px);
   }
+  hr {
+    margin: 10px 0;
+  }
+  .search-submit-wide {
+    display: block;
+    width: calc(100% + 26px);
+    margin-top: -13px;
+    margin-left: -13px;
+    margin-right: -13px;
+  }
 }
 
 .datetimepicker-bottom-left-custom {
@@ -144,7 +154,7 @@ textarea.do_wysihtml5 {
   width: 625px;
 }
 
-textarea {
+textarea.text {
   width: 100%;
   max-width: 600px;
   height: 90px;
@@ -170,4 +180,23 @@ textarea {
 
 .label.control-label.label-reset {
   display: block;
+}
+
+.list_edit .form-horizontal .control-group {
+  margin-bottom: 1px;
+}
+
+.auto-submit-checkbox-wrap {
+  display: inline-block;
+  padding: 2px 4px 2px 6px;
+  border-radius: 5px;
+  input.js-auto-submit-checkbox[type='checkbox'] {
+    margin: 0;
+  }
+  &.success {
+    background-color: #dff0d8;
+  }
+  &.error {
+    background-color: #f2dede;
+  }
 }

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

@@ -1,27 +1,24 @@
-// tabs
 .locale_tabs {
   @include colored_tabs(#999);
 }
-// icons
+
 .locale_tabs {
-  @each $lang in ru, uk, en, it, de, fr, es {
+  @each $locale in ru, uk, en, it, de, fr, es, pl {
     li {
-      a.ico_#{$lang} {
-          background-position: 10px center;
-          background-repeat: no-repeat;
-          background-image: image-url("admin/flags/flag_#{$lang}_nonact.gif");
-          background-color: white;
+      a.ico_#{$locale} {
+        opacity: 0.5;
+        padding-left: 12px;
       }
-      &.active a.ico_#{$lang} {
-          background-image: image-url("admin/flags/flag_#{$lang}.gif");
+      &.active a.ico_#{$locale} {
+        opacity: 1;
       }
     }
 
-    .t_locale_#{$lang} {
-      background: image-url("admin/flags/b_#{$lang}.png") 10px center no-repeat;
+    .t_locale_#{$locale} {
+      background: image-url("admin/flags/#{$locale}.png") 10px center no-repeat;
     }
-    ##{$lang} {
-      .t_locale_#{$lang} {
+    ##{$locale} {
+      .t_locale_#{$locale} {
          display: none;
       }
     }
@@ -30,7 +27,7 @@
 
 .t_locales {
   position: absolute;
-  top: 0px;
+  top: 0;
   left: -5px;
   height: 60px;
   width: 40px;
@@ -46,36 +43,4 @@
   &:hover {
     opacity: 1;
   }
-}
-
-// NON display: none; tabs
-//.tab-content > .tab-pane {
-//  clear: both;
-//  display: block;
-//  position: absolute;
-//  height: 0px;
-//  overflow: hidden !important;
-//  &.active {
-//    position: relative;
-//    height: auto;
-//    overflow: visible !important;
-//  }
-//}
-
-//.asset_description {
-//  width: 1000px;
-//}
-//
-//.asset_block {
-//  clear: both;
-//  padding: 5px 0;
-//}
-//
-//.asset_image {
-//  float: left;
-//  margin: 0 5px 5px 0;
-//}
-//
-//.asset_inputs input {
-//  margin-bottom: 5px;
-//}
+}

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

@@ -27,6 +27,11 @@
   margin-left: 15px;
 }
 
+.aggregations {
+  float: left;
+  margin: 5px;
+}
+
 .breadcrumb {
   margin-bottom: 5px;
 }

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

@@ -1,7 +1,7 @@
 //= require bootstrap-wysihtml5
-//= require ab_admin/bootstrap-editable
 //= require select2
 //= require fancybox
 //= require ab_admin/bootstrap_and_overrides
+//= require ab_admin/bootstrap-editable
 //= require ab_admin/bootstrap-datetimepicker
 //= require ab_admin/fileupload

data/app/controllers/admin/base_controller.rb

@@ -19,7 +19,7 @@ class Admin::BaseController < ::InheritedResources::Base
 
   helper_method :admin?, :moderator?
 
-  helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items,
+  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,
                 :normalized_index_views, :current_index_view, :pjax?, :xhr?, :max_per_page, :params_for_links
 
@@ -206,15 +206,7 @@ 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,
-        list_dblclick: true
-    }
+    {sidebar: collection_action?, well: (collection_action? || %w(show history).include?(action_name))}.update(AbAdmin.default_resource_settings)
   end
 
   def action_items
@@ -236,9 +228,10 @@ 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)
+  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
@@ -279,11 +272,17 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def search_collection
-    query = params[:q].try!{|q| q.permit!.to_h } || {}
+    @search_collection ||= begin
+      @search = end_of_association_chain.accessible_by(current_ability).ransack(query_params)
+      with_scopes(@search.result(distinct: @search.object.joins_values.present?)).admin(current_user)
+    end
+  end
+
+  def query_params
+    query = params[:q].try! {|q| q.permit!.to_h} || {}
     nested = resource_class.respond_to?(:acts_as_nested_set_options) && current_index_view == 'tree'
     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?)
+    query.reject_blank
   end
 
   def with_scopes(relation)