lotus_admin 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f28169cb1da38743faa9e32ed4399425d5dc3ddc1b95831ca6cef5725351db
-  data.tar.gz: 518d70fd6adf87fc29a924fcd011f9f239b086695f4322fcea93a51f25e35e06
+  metadata.gz: 045cf584020f6a9ddb26bb32732a6c34d0a562d2691351fea2748acc07930140
+  data.tar.gz: 7cb526a8e6abc0d62357d47d394a4d83b8ac02ebd6c31c42b1b464e7872911c0
 SHA512:
-  metadata.gz: 57d246263ad9d3b2c37bfb3ff94e8af6c21b77339700bd6039e48ded5396ae6cd17f391a34c8fe0265cad35965468fea88961f56baa6c5f7846cc8c5b4f3dbe1
-  data.tar.gz: d3a4bcb8258f941942c5397a9b1f871f4a87b35fc5ea2da5228f539eb1ed69ca90b8c58d3794731aeee6a881f52e09d85cd69145be47b5640496a4120b87d2fe
+  metadata.gz: fa06a04c853e7412efdc49d4f4f6b821cb8638dc962a485549881fbdb68ecd19a505ccb379405de262f2f3387186fdcfc8253daf0b23aebd3680d910c28da14c
+  data.tar.gz: 61f92a76cfeedbd9e1d0d1353961716207baa72d10a7fece3dacd65d6e239902d94d107ae4ef52b4b07f9b229b94e73a44d3db9ae292ca09057116f43ff2fdb9

data/app/controllers/lotus_admin/resource_controller.rb

@@ -43,6 +43,16 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
     end
   end
 
+  def edit(&block)
+    authorize(resource) if using_pundit?
+
+    if block.present?
+      block.call
+    else
+      render :edit
+    end
+  end
+
   def update(&block)
     authorize(resource) if using_pundit?
 

data/app/helpers/lotus_admin/link_helpers.rb

@@ -1,5 +1,33 @@
 module LotusAdmin
   module LinkHelpers
+    def default_table_actions_column(resource)
+      render 'lotus_admin/shared/table/actions', resource: resource
+    end
+
+    def view_resource_item(resource)
+      if policy(resource).show?
+        content_tag(:li) { view_link(resource) }
+      end
+    end
+
+    def new_resource_item(parent = nil)
+      if policy(resource_class).new?
+        content_tag(:li) { new_link(parent) }
+      end
+    end
+
+    def edit_resource_item(resource)
+      if policy(resource).edit?
+        content_tag(:li) { edit_link(resource) }
+      end
+    end
+
+    def destroy_resource_item(resource)
+      if policy(resource).destroy?
+        content_tag(:li) { destroy_link(resource) }
+      end
+    end
+
     def view_link(resource)
       link_to lotus_admin.polymorphic_path(resource) do
         content_tag(:i, nil, class: 'zmdi zmdi-eye')

data/app/views/lotus_admin/resource/edit.html.haml

@@ -2,6 +2,6 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
 = render 'form'

data/app/views/lotus_admin/resource/index.html.haml

@@ -1,5 +1,5 @@
 - content_for :action_items do
-  %li= new_link
+  = new_resource_item
 
 = render_index do
   .table-responsive
@@ -12,8 +12,4 @@
         - collection.each do |resource|
           %tr
             %td= link_to resource.id, [lotus_admin, resource]
-            %td.actions-col
-              %ul.actions
-                %li= view_link(resource)
-                %li= edit_link(resource)
-                %li= destroy_link(resource)
+            = default_table_actions_column(resource)

data/app/views/lotus_admin/resource/show.html.haml

@@ -2,9 +2,9 @@
   %h2= page_title!("#{ resource_class.model_name.human } Details")
 
   %ul.actions
-    %li= edit_link(resource)
-    %li= destroy_link(resource)
-    %li= new_link
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)
+    = new_resource_item
 
 .card
   .card-header

data/app/views/lotus_admin/shared/table/_actions.html.haml

@@ -0,0 +1,5 @@
+%td.actions-col
+  %ul.actions
+    = view_resource_item(resource)
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)

data/app/views/lotus_admin/users/edit.html.haml

@@ -2,7 +2,7 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
 .card
   .card-header

data/app/views/lotus_admin/users/index.html.haml

@@ -1,5 +1,5 @@
 - content_for :action_items do
-  %li= new_link
+  = new_resource_item
 
 = render_index do
   .table-responsive
@@ -20,6 +20,6 @@
             %td= user.email
             %td.actions-col
               %ul.actions
-                %li= view_link(user)
-                %li= edit_link(user)
-                %li= destroy_link(user)
+                = view_resource_item(user)
+                = edit_resource_item(user)
+                = destroy_resource_item(user)

data/app/views/lotus_admin/users/show.html.haml

@@ -2,8 +2,8 @@
   %h2= page_title!("#{ resource_class.model_name.human } Details")
 
   %ul.actions
-    %li= edit_link(resource)
-    %li= destroy_link(resource)
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)
 
 .card
   .card-header

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -453,6 +453,7 @@ files:
 - app/views/lotus_admin/shared/_index.html.haml
 - app/views/lotus_admin/shared/filters/_modal.html.haml
 - app/views/lotus_admin/shared/filters/_results_banner.html.haml
+- app/views/lotus_admin/shared/table/_actions.html.haml
 - app/views/lotus_admin/user_mailer/invited.html.haml
 - app/views/lotus_admin/user_mailer/invited.text.erb
 - app/views/lotus_admin/users/_form.html.haml