ab_admin 0.3.3 → 0.3.4

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

@@ -45,7 +45,7 @@ class window.AdminAssets
       $curr_cont = $asset.closest('.fileupload')
       $curr_list = $curr_cont.find('.fileupload-list')
       asset_klass = $curr_cont.data('asset')
-      $main_list = $(".fileupload.one_asset[data-asset='#{asset_klass}'] .fileupload-list")
+      $main_list = $(".fileupload.one_asset[data-asset='#{asset_klass}'] .fileupload-list:first")
 
       $.post "/admin/assets/#{$asset.data('id')}/main", ->
         $main_list.find('.asset').appendTo($curr_list)

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

@@ -15,16 +15,17 @@ $ ->
         action = $el.data('action')
         $('#batch_action').val(action)
         $form = $('#batch_action_form')
-        $form.append("<input type='checkbox' name='ids[]' checked='1' value='#{id}'/>") for id in ids
+        $form.append("<input type='checkbox' name='ids[]' checked='1' value='#{id}' style='display:none;'/>") for id in ids
         $form.submit()
 
-    $(document).on 'click', '#list tbody tr', (e) ->
+    $(document).on 'click', '#list > tbody > tr', (e) ->
       return true unless _.include(['TR', 'TD'], e.target.tagName)
       e.preventDefault()
       e.stopPropagation()
       $el = $(this)
-      $el.closest('tr').toggleClass('active_row')
-      $el.find('td:first input').attr 'checked', (i, v) -> !v
+      if $(e.target).closest('table').attr('id') == 'list'
+        $el.closest('tr').toggleClass('active_row')
+        $el.find('td:first input').attr 'checked', (i, v) -> !v
 
     $(document).on 'click confirm:success', '.batch_action_link', (e) ->
       e.preventDefault()

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

@@ -61,7 +61,7 @@ class window.ColumnsHider
       $('#columns_hider').modal('hide')
       @refreshColumns()
       @setData()
-    $(document).on 'pjax:end', =>
+    $(document).on 'pjax:end admin:list_init', =>
       @refreshColumns()
 
   refreshColumns: ->
@@ -71,7 +71,7 @@ class window.ColumnsHider
         @hideByIndex(i + 1)
 
   hideByIndex: (i) ->
-    $("#list tr th:nth-child(#{i}), #list tr td:nth-child(#{i})").hide()
+    $("#list > thead > tr > th:nth-child(#{i}), #list > tbody > tr > td:nth-child(#{i})").hide()
 
   showAll: ->
     $("#list tr th, #list tr td").show()

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

@@ -16,8 +16,8 @@ $ ->
   $(document).on 'admin:init', (e) ->
     return unless window.viewType == 'list'
     clonePagination()
-    initPopover()
-    initTooltip()
+
+    $(document).trigger('admin:list_init')
 
     $('.per_page').click ->
       $.cookie('pp', $(this).data('val'))
@@ -26,18 +26,23 @@ $ ->
       e.preventDefault()
       $(this).closest('tr').remove()
 
-  $(document).on 'admin:form_init', 'form', (e) ->
-    focusInput($(this))
-    initEditor()
-    initFancySelect()
-    inputSetToggle()
-
   $(document).on 'admin:init', (e) ->
     return unless window.viewType == 'form'
     $form = $('form.simple_form')
     window.resource_id = $form.data('id')
     $form.trigger('admin:form_init')
 
+  $(document).on 'admin:list_init', ->
+    initPopover()
+    initTooltip()
+
+  $(document).on 'admin:form_init', 'form', (e) ->
+#    focusInput($(this))
+    initEditor()
+    initFancySelect()
+    inputSetToggle()
+    initPickers()
+
   $(document).on 'pjax:end', ->
     $(document).trigger({type: 'admin:init', pjax: true})
   $(document).trigger({type: 'admin:init'})
@@ -46,7 +51,6 @@ $ ->
     e.preventDefault()
     $(this).find('td a.resource_id_link').toHref()
 
-
   initFancySelect()
   initNestedFields()
   #  initAcFileds()

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

@@ -44,7 +44,7 @@ window.flash = (message, type='notice') ->
 
 window.focusInput = (scope=null) ->
   scope ||= $('form.simple_form:first')
-  $('input[type="text"],input[type="string"],select:visible,textarea:visible').not('.fancy_select,.datepicker').get(0)?.focus()
+  $('input[type="text"],input[type="string"],select:visible,textarea:visible', scope).not('.fancy_select,.datepicker').get(0)?.focus()
 
 window.templateStorage = {}
 window.fetchTemplate = (tmpl_id) ->

data/app/assets/javascripts/ab_admin/main.js

@@ -27,6 +27,6 @@
 //= require ab_admin/components/in_place_edit
 //= require ab_admin/components/init_nested_filelds
 //= require ab_admin/components/hotkeys
+//= require ab_admin/inputs/datetime_input
 
 //= require ab_admin/core/init
-//= require ab_admin/inputs/datetime_input

data/app/controllers/admin/base_controller.rb

@@ -9,8 +9,7 @@ class Admin::BaseController < ::InheritedResources::Base
   before_filter :authenticate_user!, :require_moderator
   before_filter :add_breadcrumbs, :set_title, :set_user_vars, unless: :xhr?
 
-  class_attribute :export_builder, :batch_action_list, instance_reader: false, instance_writer: false
-  self.batch_action_list = [AbAdmin::Config::BatchAction.new(:destroy, confirm: I18n.t('admin.delete_confirmation'))]
+  class_attribute :export_builder, :batch_action_list, :button_scopes, instance_reader: false, instance_writer: false
 
   has_scope :ids, type: :array
 
@@ -95,7 +94,12 @@ class Admin::BaseController < ::InheritedResources::Base
   protected
 
   def batch_action_list
-    self.class.batch_action_list
+    self.class.batch_action_list ||= begin
+      resource_class.batch_actions.map do |a|
+        opts = a == :destroy ? {confirm: I18n.t('admin.delete_confirmation')} : {}
+        AbAdmin::Config::BatchAction.new(a, opts)
+      end
+    end
   end
 
   def self.inherited(base)
@@ -161,7 +165,7 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def button_scopes
-    @@button_scopes ||= begin
+    self.class.button_scopes ||= begin
       res = {}
       self.class.scopes_configuration.except(:ids).each do |k, v|
         res[k] = v if v[:type] == :default
@@ -282,8 +286,8 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def get_role
-    return [:admin, :moderator] if admin?
-    return [:moderator] if moderator?
+    return [:default, :moderator, :admin] if admin?
+    return [:default, :moderator] if moderator?
     nil
   end
 

data/app/views/admin/base/create.js.erb

@@ -1,6 +1,8 @@
 <%
   form_wrap_id = dom_id(resource_class.new, 'list_edit')
-  html = render('table', collection: [resource])[/<tr id[^>]+>.*<\/tr>/].html_safe
+  html = render('table', collection: [resource])[/<tr id[^>]+>.*<\/tr>/m].html_safe
 %>
 $('#<%= form_wrap_id %>').remove();
-$('#list tbody').prepend('<%= j html %>');
+$('#list tbody').prepend('<%= j html %>');
+$('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
+$(document).trigger('admin:list_init');

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

@@ -1,7 +1,7 @@
-- 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/batch_actions'
+/- 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/batch_actions'
     
 #content= render settings[:index_view]
 .pagination.pull-left
@@ -10,4 +10,4 @@
 .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
+      a.btn.per_page data-val=c href=url_for(params.merge(per_page: c)) class=('active' if c == collection.per_page) = c

data/app/views/admin/base/update.js.erb

@@ -4,4 +4,5 @@
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');
-$('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl()
+$('#<%= dom_id(resource, 'list') %>').addClass('success').scrollToEl();
+$(document).trigger('admin:list_init');

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

@@ -1,6 +1,6 @@
 .batch_actions.clearfix
   - cache [I18n.locale, 'admin', resource_class.name, 'batch_actions'] do
-    - if settings[:batch]
+    - if settings[:batch] && settings[:index_view] == 'table'
       .btn-group
         a.btn.dropdown-toggle data-toggle="dropdown" href="#" 
           = t 'admin.batch_actions.title'

data/config/routes.rb

@@ -5,7 +5,7 @@ Rails.application.routes.draw do
     get 'dashboards', as: 'dashboards'
 
     resources :structures do
-      post :rebuild, on: :collection
+      post :batch, :rebuild, on: :collection
       resource :static_page
     end
 

data/lib/ab_admin/controllers/can_can_manager_resource.rb

@@ -1,3 +1,8 @@
 class AbAdmin::Controllers::CanCanManagerResource < CanCan::InheritedResource
   delegate :resource_class, to: :@controller
+
+  def instance_name
+    @controller.send(:resource_instance_name)
+  end
+
 end

data/lib/ab_admin/core_ext/string.rb

@@ -16,7 +16,7 @@ class String
   end
 
   def is_int?
-    self =~ /^[-+]?[0-9]*$/
+    self =~ /^[-+]?[0-9]+$/
   end
 
   def is_number?

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -35,9 +35,9 @@ module AbAdmin
         data = {
             type: options[:type], source: options[:source].try(:to_json),
             model: resource_class.model_name.singular, url: resource_path(item),
-            name: attr, value: item[attr]
+            name: attr, value: options[:value] || item[attr]
         }
-        link_to admin_pretty_data(item[attr]).html_safe, '#', class: 'editable', data: data
+        link_to admin_pretty_data(item[attr].to_s).html_safe, '#', class: 'editable', data: data
       end
 
       def options_for_ckeditor(options = {})

metadata

@@ -2,14 +2,14 @@
 name: ab_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -1073,7 +1073,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 547698765414100647
+      hash: -2603358076628246564
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -1082,7 +1082,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 547698765414100647
+      hash: -2603358076628246564
   none: false
 requirements: []
 rubyforge_project: