adminsite 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94fdef568c79b7bcf4bbd483d17b44459ef266c
-  data.tar.gz: 40eabefb8e62f71f42225bec10e965f994940f62
+  metadata.gz: 754b4b138ee03318ea3d2155e709ae477127aef1
+  data.tar.gz: 1f440edada2614f81df6c50146429f49f72d254b
 SHA512:
-  metadata.gz: dc45991fcde7d78b295285661130598397aafd04f14463d296feef9d79e5ba5a7826b66466379f980863cb1090ef62f4f3ea8d5ff2243998d5e2f92557c079b0
-  data.tar.gz: 757cc09d1ae378fa23c9e03d8438e7361301dd5e2c4331867f438034ae7856a2a59a7a4adb937637a29dc2509b7337eda59a3369ab3a4d87cbca14dc967c907e
+  metadata.gz: 3c12d04ab8543ec31da0890a29cb9369b9ea12c5f98296a5c37a8d79b6f2a2ed8adfa42d52a25aee2d46091e0c7332dd68a5af464d0f4f264cdf09de36b46c6f
+  data.tar.gz: 19685da4087543c4fbed9d34e5e23e4cf16d9db4b277f0110db8d6aa5c27d9128ceec4e7632bf0626c104e063ee43beadc243d9a4fd2dd625710e3a587f50df9

data/Gemfile.lock

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

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

@@ -99,7 +99,7 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
   end
 
   def find_resource
-    @resource ||= resources.find(params[:id])
+    @resource ||= scope_resources.find(params[:id])
   end
 
   def scope_resources

data/app/views/adminsite/admin/adminsite_page_layouts/index.html.haml

@@ -4,6 +4,7 @@
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}"
+    #action_bar
+      = link_to_new "New #{label_resource_class}"
   There are no page layouts. Go ahead and
-  #{link_to 'add the first one', new_admin_adminsite_page_layout_path}.
+  #{link_to 'add the first one', admin_resource_path(nil, :new)}.

data/app/views/adminsite/admin/adminsite_pages/index.html.haml

@@ -4,13 +4,15 @@
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}"
+    #action_bar
+      = link_to_new "New #{label_resource_class}"
   There are no pages. Go ahead and
   #{link_to 'add the first one', new_admin_adminsite_page_path}.
 - else
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}"
+    #action_bar
+      = link_to_new "New #{label_resource_class}"
   You should #{link_to 'add a page layout', new_admin_adminsite_page_layout_path}
   before adding your first page.

data/app/views/adminsite/admin/crud/show.html.haml

@@ -1,8 +1,8 @@
 - content_for :header_left do
   = controller_name
 - content_for :header_right do
-  #show_actions
-    = link_to_back 'Back', url_for(controller: controller_name, action: :index )
+  #action_bar
+    = link_to_back
 
 - if Rails.env.development?
   please override in '/app/views/adminsite/admin/#{controller_name}/show.html.haml'

data/app/views/adminsite/admin/resources/_list.haml

@@ -14,18 +14,13 @@
     - @resources.each do |resource|
       %tr{onclick: 'Adminsite.selectedRow(this);'}
         - if resource_admin_config.actions_placement == :left
-          %td.actions.resource_actions
-            %ul
-              - resource_admin_config.default_member_actions(resource).each do |action|
-                %li= send("link_to_#{action}", resource)
+          = render partial: 'list_actions', locals: {resource: resource }
         %td.resource_selection_cell
           = check_box_tag 'collection_selection[]', resource.id, false, :class => 'collection_selection'
         - resource_admin_config.attributes_index.each do |attr|
           = display_resource_value(resource, attr)
         - if resource_admin_config.actions_placement == :right
-          %td.actions.resource_actions
-            %ul
-              - resource_admin_config.default_member_actions(resource).each do |action|
-                %li= send("link_to_#{action}", resource)
+          = render partial: 'list_actions', locals: {resource: resource }
 
 = paginate(@resources, :window => 2)
+

data/app/views/adminsite/admin/resources/_list_actions.html.haml

@@ -0,0 +1,4 @@
+%td.actions.resource_actions
+  %ul
+    - resource_admin_config.default_member_actions(resource).each do |action|
+      %li= send("link_to_#{action}", resource)

data/lib/adminsite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Robin Wunderlin
@@ -318,6 +318,7 @@ files:
 - app/views/adminsite/admin/resources/_filters.html.haml
 - app/views/adminsite/admin/resources/_form.haml
 - app/views/adminsite/admin/resources/_list.haml
+- app/views/adminsite/admin/resources/_list_actions.html.haml
 - app/views/adminsite/admin/resources/_search_form.html.haml
 - app/views/adminsite/admin/resources/edit.haml
 - app/views/adminsite/admin/resources/index.haml