ab_admin 0.3.5 → 0.3.6

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

@@ -59,6 +59,7 @@
     padding-top: 10px;
     padding-left: 5px;
     z-index: 2;
+    position: relative;
   }
   .fileupload-button {
     z-index: 3;

data/app/controllers/admin/base_controller.rb

@@ -93,6 +93,10 @@ class Admin::BaseController < ::InheritedResources::Base
 
   protected
 
+  def default_url_options
+    {format: nil}
+  end
+
   def batch_action_list
     self.class.batch_action_list ||= begin
       resource_class.batch_actions.map do |a|
@@ -106,6 +110,7 @@ class Admin::BaseController < ::InheritedResources::Base
     super
     base.class_eval do
       before_create :bind_current_user
+      before_save :bind_current_updater
     end
   end
 
@@ -126,16 +131,6 @@ class Admin::BaseController < ::InheritedResources::Base
     export_builder.render_options
   end
 
-  def set_title
-    name_for_lookup = params[:custom_action] || action_name
-    lookups = [:"admin.#{controller_name}.actions.#{name_for_lookup}.title",
-               :"admin.#{controller_name}.actions.#{name_for_lookup}",
-               :"admin.actions.#{name_for_lookup}.title",
-               :"admin.actions.#{name_for_lookup}",
-               name_for_lookup]
-    @page_title ||= [resource_class.model_name.human(count: 1), t(lookups.shift, default: lookups)].join(' - ')
-  end
-
   def preview_resource_path(item)
     nil
   end
@@ -186,6 +181,16 @@ class Admin::BaseController < ::InheritedResources::Base
     end
   end
 
+  def set_title
+    name_for_lookup = params[:custom_action] || action_name
+    lookups = [:"admin.#{controller_name}.actions.#{name_for_lookup}.title",
+               :"admin.#{controller_name}.actions.#{name_for_lookup}",
+               :"admin.actions.#{name_for_lookup}.title",
+               :"admin.actions.#{name_for_lookup}",
+               name_for_lookup]
+    @page_title ||= t(lookups.shift, default: lookups)
+  end
+
   def parent_collection_path
     {action: :index, controller: "admin/#{parent_class.model_name.plural}"}
   end
@@ -215,7 +220,11 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def set_layout
-    request.headers['X-PJAX'] ? false : 'admin/application'
+    pjax? ? false : 'admin/application'
+  end
+
+  def pjax?
+    request.headers['X-PJAX']
   end
 
   def back_or_collection
@@ -272,6 +281,10 @@ class Admin::BaseController < ::InheritedResources::Base
     resource.user_id = current_user.id if resource.respond_to?(:user_id)
   end
 
+  def bind_current_updater(*args)
+    resource.updater_id = current_user.id if resource.respond_to?(:updater_id)
+  end
+
   def xhr?
     request.xhr?
   end
@@ -303,9 +316,12 @@ class Admin::BaseController < ::InheritedResources::Base
   def render_unauthorized(exception)
     Rails.logger.debug "Access denied on #{exception.action} #{exception.subject.inspect}, user: #{current_user.try(:id)}"
 
-    respond_to do |format|
-      format.html { redirect_to (moderator? ? admin_root_path : root_path), alert: exception.message }
-      format.any { head :unauthorized }
+    if pjax?
+      render partial: 'admin/shared/flash', locals: {flash: {alert: exception.message}}
+    elsif request.format.try(:html?)
+      redirect_to (moderator? ? admin_root_path : root_path), alert: exception.message
+    else
+      head :unauthorized
     end
   end
 

data/app/controllers/admin/static_pages_controller.rb

@@ -1,7 +1,9 @@
 class Admin::StaticPagesController < Admin::BaseController
   load_and_authorize_resource
 
-  belongs_to :structure, singleton: true
+  defaults singleton: true
+
+  belongs_to :structure
 
   def settings
     {}

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

@@ -1,3 +1,5 @@
+#toggle_sidebar_off.btn.btn-large = icon('chevron-left')
+#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] do

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

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

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

@@ -5,6 +5,8 @@
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#<%= el_id %>').after('<%= j html %>');
-$('#<%= form_wrap_id %> td').attr('colspan', $('#list tr:first th').length);
+$('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
 $('#<%= el_id %>').scrollToEl();
 $('#<%= form_wrap_id %> form').trigger('admin:form_init');
+
+<%= render 'admin/shared/flash', flash: flash %>

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

@@ -11,3 +11,8 @@
   .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
+
+- if pjax? && flash.present?
+  - flash.each do |k, v|
+    = javascript_tag %[flash("#{j v}", "#{k}")]
+

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

@@ -4,5 +4,7 @@
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#list tbody').prepend('<%= j html %>');
-$('#<%= form_wrap_id %> td').attr('colspan', $('#list tr:first th').length);
+$('#<%= form_wrap_id %> td:first').attr('colspan', $('#list tr:first th').length);
 $('#<%= form_wrap_id %> form').trigger('admin:form_init');
+
+<%= render 'admin/shared/flash', flash: flash %>

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

@@ -1,6 +1,6 @@
 <%
   form_wrap_id = dom_id(resource, 'list_edit')
-  html = render('table', collection: [resource])[/<tr id[^>]+>.*<\/tr>/m].html_safe
+  html = render('table', collection: [resource]).match(/<tbody>(.*)<\/tbody>/m)[1].html_safe
 %>
 $('#<%= form_wrap_id %>').remove();
 $('#<%= dom_id(resource, 'list') %>').replaceWith('<%= j html %>');

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

@@ -1,5 +1,5 @@
 .asset id="asset_#{file.id}" data-id=file.id
-  a href=file.url target='_blank' = file.original_name
+  a href=file.url target='_blank' = file.human_name
   span== " (#{file.human_filesize}) - #{l(file.created_at, format: :long)}"
   = link_to icon('remove', true), admin_asset_path(file), remote: true, method: :delete, \
     class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}

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

@@ -0,0 +1,9 @@
+.asset id="asset_#{video.id}" data-id=video.id
+  = link_to icon('remove', true), admin_asset_path(video), remote: true, method: :delete, title: t('admin.delete'), class: 'del_asset', \
+     data: {confirm: t('admin.delete_confirmation')}
+  video controls='true'
+    source src=video.url
+    | Your browser does not support mp4 videos
+    .video-filename
+      a href=video.url target='_blank' = video.human_name
+      span== " (#{video.human_filesize}) - #{l(video.created_at, format: :long)}"

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

@@ -0,0 +1,10 @@
+script#fileupload_vtmpl type="text/x-jquery-tmpl"
+  .asset id="asset_${id}" data-id='${id}'
+    = link_to icon('remove', true), '/admin/assets/${id}', remote: true, method: :delete, title: t('admin.delete'), \
+      class: 'del_asset btn btn-danger btn-mini', data: {confirm: t('admin.delete_confirmation')}
+    video controls='true'
+      source src='${url}'
+      | Your browser does not support mp4 videos
+      .video-filename
+        a href='${url}' target='_blank' ${original_name}
+        span  (${human_filesize})

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

@@ -12,10 +12,16 @@
     - button_scopes.each do |name, opts|
       - active = params[opts[:as]]
       a.btn[href=(url_for(opts[:as] => (active ? nil : 1))) class=('active' if active)]= t "admin.scopes.#{name}"
+
+  a.btn.pull-left#columns_hider_show[href="#columns_hider" data-toggle='modal']= t 'admin.columns_hider.button'
+
+  .btn-group#view_layout
+    .btn data-css='main_wide' = icon('align-left')
+    .btn data-css='main_reverse' = icon('align-right')
+
   .btn-group.downloads
     = icon('download-alt')
-    - %w(csv xls json).each do |format|
+    /- %w(csv xls json).each do |format|
+    - %w(csv xls).each do |format|
       - next if format == 'xls' && !defined?(Mime::XLSX)
       = link_to format, params.merge(format: format), id: "export_#{format}"
-  a.btn.pull-right#columns_hider_show[href="#columns_hider" data-toggle='modal']= t 'admin.columns_hider.button'
-

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

@@ -1,7 +1,6 @@
 - if @breadcrumbs.present?
-  ul.breadcrumb
-    - @breadcrumbs[0..-2].each do |crumb|
-      li
-      	= link_to crumb[:name], crumb[:url], crumb[:options]
-      	span.divider  / 
-    li.active= link_to @breadcrumbs.last[:name], @breadcrumbs.last[:url], @breadcrumbs.last[:options]
+  - @breadcrumbs[0..-2].each do |crumb|
+    li
+      = link_to crumb[:name], crumb[:url], crumb[:options]
+      span.divider  / 
+  li.active= link_to [@breadcrumbs.last[:name] || @breadcrumbs.last[:url], @page_title].join(' - '), @breadcrumbs.last[:url], @breadcrumbs.last[:options]

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

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

data/app/views/admin/shared/inputs/_checkbox_tree.html.slim

@@ -0,0 +1,14 @@
+- attr_ids_method = "#{attribute_name.to_s.singularize}_ids"
+- attr_ids = f.object.send(attr_ids_method)
+- attr_name = "#{f.object_name}[#{attr_ids_method}][]"
+- opts = reflection.options.slice(:conditions, :order)
+
+- reflection.klass.roots.all(opts).each do |root|
+  .checkbox_tree_input
+    label.checkbox
+      = check_box_tag attr_name, root.id, attr_ids.include?(root.id)
+      b= AbAdmin.display_name(root)
+    - root.children.all(opts).each do |child|
+      label.checkbox
+        = check_box_tag attr_name, child.id, attr_ids.include?(child.id)
+        = AbAdmin.display_name(child)

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

@@ -1,7 +1,7 @@
 = admin_form_for @structure do |f|
   = f.locale_tabs do |l|
     = f.input :title, locale: l
-    = f.input :redirect_url, locale: l
+    = f.input :redirect_url, locale: l, as: :string
 
   = f.input :slug
   - if @structure.moveable?
@@ -11,9 +11,12 @@
 
   = f.input :is_visible
 
-  = input_set t('admin.pictures') do
+  = input_set ha(:picture) do
     = f.attach_file_field :picture, file_max_size: 2
 
+  = input_set ha(:pictures) do
+    = f.attach_file_field :pictures, file_max_size: 2
+
   = input_set t('admin.keywords') do
     = render 'admin/headers/form', f: f
 

data/app/views/layouts/admin/_footer.html.slim

@@ -5,6 +5,7 @@ footer
 = cache [I18n.locale, 'admin', 'footer'] do
   = render 'admin/fileupload/tmpl'
   = render 'admin/fileupload/ftmpl'
+  = render 'admin/fileupload/vtmpl'
   = render 'admin/shared/columns_hider'
 
 - unless admin?

data/app/views/layouts/admin/_navigation.html.slim

@@ -20,11 +20,9 @@ header.navbar
             li.divider
             li= link_to(t('admin.auth.sign_out'), destroy_user_session_path, method: 'delete')
 
-  = render 'admin/shared/breadcrumbs'
+  ul.breadcrumb
+    li.resource_actions
+      - action_items.each do |act|
+        = action_link(act)
+    = render 'admin/shared/breadcrumbs'
 
-.top_bar.clearfix
-  .resource_actions
-    - action_items.each do |act|
-      = action_link(act)
-  .resource_title
-    h1= @page_title

data/app/views/layouts/admin/application.html.slim

@@ -17,8 +17,8 @@ html id="controller_#{controller_name}"
       = render 'layouts/admin/navigation'
       #main role="main"
         .container-fluid
+          = render('admin/shared/flash', flash: flash) if flash
           #container.row-fluid
-            = render('admin/shared/flash', flash: flash) if flash
             .wrap_content
               .clearfix[data-pjax-container=true class=layout_css]= yield
             - if collection_action? && settings[:search]

data/config/locales/en.yml

@@ -197,14 +197,8 @@ en:
         deleted: Removed
         pending: Inactive
         suspended: Frozen
-    versions:
-      current: "The current version of"
-      item: Element
-      modified_at: "Date of editing"
-      modified_by: "Edited (a)"
-      title: Story
-      type: Type
   admin_js:
+    empty: Empty
     add_link: Create?
     button_description: Description
     button_name_add: Add
@@ -295,8 +289,8 @@ en:
     updating: "Update ..."
     "yes": "Yes"
   will_paginate:
-    next_label: "Next. →"
     page_gap: "..."
-    pagination_info: "Displaying <b>%{from}&nbsp;-&nbsp;%{to}</b> of %{count} total"
+    pagination_info: "<b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b>"
     pagination_info_empty: "0 total"
-    previous_label: "← Prev."
+    next_label: "→"
+    previous_label: "←"

data/config/locales/it.yml

@@ -211,14 +211,7 @@ it:
         deleted: Rimosso
         pending: Inattivo
         suspended: Congelato
-    versions: 
-      current: La versione corrente di
-      item: Elemento
-      modified_at: Data di modifica
-      modified_by: Edited (a)
-      title: Storia
-      type: Tipo
-  admin_js: 
+  admin_js:
     add_link: Crea?
     button_description: Descrizione
     button_name_add: Aggiungere

data/config/locales/ru.yml

@@ -188,13 +188,6 @@ ru:
         deleted: "Удален"
         pending: "Неактивирован"
         suspended: "Заморожен"
-    versions: 
-      current: "Текущая версия"
-      item: "Элемент"
-      modified_at: "Дата редактирования"
-      modified_by: "Редактировал(а)"
-      title: "История"
-      type: "Тип"
     structure:
       kind:
         group: "Группа страницек"
@@ -207,6 +200,7 @@ ru:
         default: "По умолчанию"
         menu: "Меню"
   admin_js:
+    empty: Пусто
     add_link: "Создать?"
     button_description: "Описание"
     button_name_add: "Добавить"
@@ -290,11 +284,11 @@ ru:
     updating: "Обновление..."
     "yes": "Да"
   will_paginate: 
-    next_label: "След. →"
     page_gap: "…"
-    pagination_info: "Показано <b>%{from}&nbsp;-&nbsp;%{to}</b> из <b>%{count}</b> всего"
+    pagination_info: "<b>%{from}&nbsp;-&nbsp;%{to}</b> из <b>%{count}</b>"
     pagination_info_empty: "0 всего"
-    previous_label: "&#8592; Пред."
+    next_label: "→"
+    previous_label: "←"
 
   errors:
     messages:

data/features/dsl/export.feature

@@ -28,12 +28,12 @@ Feature: Export
     And should see "$234"
     And should see "Chair"
 
-  Scenario: Export to json format
-    When I am on the admin products page
-    And I follow "export_json"
-    Then should see "t-12"
-    And should see "234"
-    And should see "Chair"
+#  Scenario: Export to json format
+#    When I am on the admin products page
+#    And I follow "export_json"
+#    Then should see "t-12"
+#    And should see "234"
+#    And should see "Chair"
 
   Scenario: Export to xls format
     When I am on the admin products page

data/lib/ab_admin/concerns/utilities.rb

@@ -10,17 +10,17 @@ module AbAdmin
 
       module ClassMethods
         def max_time
-          Rails.cache.fetch("by_class_#{name}", expires_in: 60) { maximum(:updated_at).to_i }
+          Rails.cache.fetch("by_class_#{name}", expires_in: 60) { unscoped.maximum(:updated_at).to_i }
         end
 
         def max_time_by_scope(scope)
-          Rails.cache.fetch("by_class_#{name}_#{scope}", expires_in: 60) { send(scope).maximum(:updated_at).to_i }
+          Rails.cache.fetch("by_class_#{name}_#{scope}", expires_in: 60) { unscoped.send(scope).maximum(:updated_at).to_i }
         end
 
         def full_truncate
           destroy_all
           truncate!
-          const_get(:Translation).truncate! if translates?
+          const_get(:Translation).truncate! if respond_to?(:translates?) && translates?
         end
 
         def all_ids