adminsite 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 754b4b138ee03318ea3d2155e709ae477127aef1
-  data.tar.gz: 1f440edada2614f81df6c50146429f49f72d254b
+  metadata.gz: 33b92eff4ef81dd01206c0bef13e782b13026250
+  data.tar.gz: 80b16b65be9dc2ef6b775b911d1539acc18b244e
 SHA512:
-  metadata.gz: 3c12d04ab8543ec31da0890a29cb9369b9ea12c5f98296a5c37a8d79b6f2a2ed8adfa42d52a25aee2d46091e0c7332dd68a5af464d0f4f264cdf09de36b46c6f
-  data.tar.gz: 19685da4087543c4fbed9d34e5e23e4cf16d9db4b277f0110db8d6aa5c27d9128ceec4e7632bf0626c104e063ee43beadc243d9a4fd2dd625710e3a587f50df9
+  metadata.gz: 1ffaa0b9056a2abda450953a8b8d40ff5db9f1525a4a334eecd3c618065df7ea895241ffc88b149560ec28bb691d06227efcf49472de617b308374b4e5c7760e
+  data.tar.gz: fb8dd998fff1ee04bce47a3ae973aa614c083ee68b0529978ac420b928f242a5f528d4e2cce9a90ba83821b556ea4b2e55001b97ac68569f1ac479ea44db6507

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (3.2.1)
+    adminsite (3.2.2)
       actionpack-page_caching
       cancancan (~> 1.10)
       codemirror-rails (>= 4.8)

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -93,7 +93,7 @@ body.adminsite {
       &:hover {
         background-color: rgba(0, 0, 0, 0.7);
       }
-      &.add, &.back, &.new {
+      &.add, &.back, &.new, &.refresh {
         padding-left: 18px;
       }
       &.add, &.new {
@@ -102,6 +102,9 @@ body.adminsite {
       &.back {
         background-image: asset-url('adminsite/admin/arrow_left.png');
       }
+      &.refresh {
+        background-image: asset-url('adminsite/admin/arrow_refresh.png');
+      }
     }
   }
   #filters {
@@ -567,12 +570,14 @@ body.adminsite {
     background-color: #cccccc;
   }
 
-  table tr.selected {
-    background-color: #d9e4ec;
-    &:nth-child(odd) {background-color: #D1DCE4}
+  table tbody tr.selected {
+    &:nth-child(odd) {
+      background-color: #D1DCE4
+    }
     .select_row {
       background-color: rgba(117, 117, 214, 0.91);
     }
+    background-color: #d9e4ec;
   }
 
 }

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -48,7 +48,7 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
 
   def index
     @q = scope_resources.ransack(params[:q])
-    @resources = @q.result.page(params[:page])
+    @resources = @q.result.order(order_params).page(params[:page])
     @ransack_params = ransack_params
     @search_params  = @ransack_params[:q].try(:except, :s)
     @show_search_form = @search_params.present?
@@ -107,7 +107,7 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
       eval("resource_class.#{filter_scopes.join('.')}")
     else
       self.class.resource_class.all
-    end.order(order_params)
+    end
   end
 
   def resource_params

data/app/helpers/admin/adminsite_application_helper.rb

@@ -47,12 +47,16 @@ module Admin::AdminsiteApplicationHelper
     label_resource_class.pluralize
   end
 
+  def link_to_refresh(text, path, options = {} )
+    link_to text, path, {:class => 'action refresh'}.merge(options)
+  end
+
   def link_to_back(text = 'Back', path = admin_resource_path)
     link_to text, path, :class => 'action back'
   end
 
   def link_to_new(text, path = admin_resource_path(nil, :new) )
-    link_to text, path, :class => 'action new'
+    link_to text, path, :class => 'action new' if can?(:new, controller.authorize_resource_class)
   end
 
   def link_to_show(resource, text = '')

data/app/helpers/admin/adminsite_menu_helper.rb

@@ -31,6 +31,14 @@ module Admin::AdminsiteMenuHelper
     child_menus = child_menus.compact
 
     if child_controller_names_authorized.count > 0
+      begin
+        url_controller_class = "#{recognize_path(url)[:controller]}_controller".classify.constantize
+        if !can?(:read, url_controller_class.new.authorize_resource_class)
+          url = content_index_path(child_controller_names_authorized.first)
+        end
+      rescue
+      end
+
       html_options = {method: method}
       html_options[:title] = current_adminsite_admin_user.email if klasses == 'log_out'
       link = link_to(label, "#{url}?admin_menu=#{admin_menu}", html_options)
@@ -41,6 +49,22 @@ module Admin::AdminsiteMenuHelper
     result
   end
 
+  def content_index_path(controller_name)
+    begin
+      if controller_name != controller_name.pluralize
+        eval("admin_#{controller_name}_index_path")
+      else
+        eval("admin_#{controller_name}_path")
+      end
+    rescue
+    end
+  end
+
+  def content_index_link(controller_name, admin_menu, method = nil)
+    path = content_index_path(controller_name)
+    link_to(content_menu_label(path, controller_name), "#{path}?admin_menu=#{admin_menu}", method: method, )
+  end
+
   def content_menu_label(url, controller_name)
     menu_controller = recognize_path(url)[:controller]
     return controller_name.titlecase if menu_controller.blank?
@@ -48,13 +72,8 @@ module Admin::AdminsiteMenuHelper
   end
 
   def content_menu_item(controller_name, admin_menu, klasses, method )
-    if controller_name != controller_name.pluralize
-      url = eval("admin_#{controller_name}_index_path")
-    else
-      url = eval("admin_#{controller_name}_path")
-    end
-    link = link_to(content_menu_label(url, controller_name), "#{url}?admin_menu=#{admin_menu}", method: method, )
-    raw "<li class='#{html_classes(url, controller_name, klasses, admin_menu )}'>#{link}</li>"
+    link = content_index_link(controller_name, admin_menu, method )
+    raw "<li class='#{html_classes(content_index_path(controller_name), controller_name, klasses, admin_menu )}'>#{link}</li>"
   end
 
   def current_url?(url, label = '')

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "3.2.1" unless defined?(Adminsite::VERSION)
+  VERSION = "3.2.2" unless defined?(Adminsite::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails