lotus_admin 1.4.4 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3ca80072d89b813035c6b9362226840dd8acefa668e97002c2cbb142998b9d
-  data.tar.gz: 1a275b54e059f89ee5384a40fb5fcf697440c1195ada84d50e071d2e31dd3e77
+  metadata.gz: 1a6d6f7dab65888fc3cc1d0c1823baa23eb80d80605bc11c292bccff92f2242a
+  data.tar.gz: 72edd101b774056720d793cbab45c79f52519add43976762c1a32f1962719037
 SHA512:
-  metadata.gz: 90247f44db4b6b0785556c8469c6b1aa62c5e3c45db85213a41b7449bbd02b914981fdda3f76e823349236d902289f52ee9e396adcd3bc4157f17949667e76eb
-  data.tar.gz: 2b4d3029f59c37c53fd14b213102d870a597ba33096965d4021d7632b8f7ce284691fce30eace6031a1c51c686e8328e724e69fb927050fe50cc65a0282ddc02
+  metadata.gz: 442cdf1f5eaf5ee45be321bfdf1dcbd0cf503101abf3a1f441e98521bb3d70a37b802e6526319edac810f46932ece767d389290fb379a27ff73ba87f917ed2f2
+  data.tar.gz: 7427bb13393baf8774e1be6bdc0613bccec45baaac602fb718e8abdedc659c4219bef7ad0b09b94a6c8a0e3bc7da890271635a2d6ca836b01513819512fb9f7c

data/app/controllers/lotus_admin/resource_controller.rb

@@ -15,34 +15,58 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
   let(:resource_class) { self.class._resource_class }
   let(:collection_path) { url_for(resource_class) }
 
-  def new
+  def new(&block)
     self.resource = build_resource
 
     authorize(resource) if using_pundit?
+
+    block.call if block.present?
   end
 
-  def create
+  def create(&block)
     self.resource = build_resource(permitted_params)
 
     authorize(resource) if using_pundit?
 
-    if resource.save
-      redirect_to after_create_redirect, notice: "Created new #{ resource_class.model_name.human } successfully"
-    else
-      render :new
+    respond_to do |format|
+      format.html
+
+      if block.present?
+        block.call
+      else
+        if resource.save
+          redirect_to after_create_redirect, notice: "Created new #{ resource_class.model_name.human } successfully"
+        else
+          render :new
+        end
+      end
     end
   end
 
-  def update
+  def edit(&block)
     authorize(resource) if using_pundit?
 
-    if resource.update(permitted_params)
-      redirect_to after_update_redirect, notice: "Updated new #{ resource_class.model_name.human } successfully"
+    if block.present?
+      block.call
     else
       render :edit
     end
   end
 
+  def update(&block)
+    authorize(resource) if using_pundit?
+
+    if block.present?
+      block.call
+    else
+      if resource.update(permitted_params)
+        redirect_to after_update_redirect, notice: "Updated #{ resource_class.model_name.human } successfully"
+      else
+        render :edit
+      end
+    end
+  end
+
   def index(&block)
     authorize(resource_class) if using_pundit?
 

data/app/controllers/lotus_admin/users_controller.rb

@@ -11,39 +11,18 @@ module LotusAdmin
     filter :created_at
     filter :last_sign_in_at
 
-    def new
-      self.resource = resource_class.new
-    end
-
     def create
-      self.resource = resource_class.new(permitted_params)
-      resource.password = Devise.friendly_token.first(8)
-
-      if resource.save
-        resource.send_invited_email_notification
+      super do
+        resource.password = Devise.friendly_token.first(8)
 
-        redirect_to [lotus_admin, resource_class], notice: "Created new #{ resource_class.model_name.human }"
-      else
-        render :new
-      end
-    end
+        if resource.save
+          resource.send_invited_email_notification
 
-    def update
-      if resource.update(permitted_params)
-        redirect_to [lotus_admin, resource], notice: 'Changes saved'
-      else
-        render :edit
+          redirect_to after_create_redirect, notice: "Created new #{ resource_class.model_name.human }"
+        else
+          render :new
+        end
       end
     end
-
-    def destroy
-      if user.destroy
-        flash[:notice] = "#{ resource_class.model_name.human } has been removed"
-      else
-        flash[:error] = "There was an error removing that #{ resource_class.model_name.human }"
-      end
-
-      redirect_to [lotus_admin, resource_class]
-    end
   end
 end

data/app/helpers/lotus_admin/link_helpers.rb

@@ -1,25 +1,57 @@
 module LotusAdmin
   module LinkHelpers
+    def default_table_actions_column(resource)
+      render 'lotus_admin/shared/table/actions', resource: resource
+    end
+
+    def undecorated(resource)
+      resource.try(:object).presence || 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
+      link_to lotus_admin.polymorphic_path(undecorated(resource)) do
         content_tag(:i, nil, class: 'zmdi zmdi-eye')
       end
     end
 
-    def new_link
-      link_to lotus_admin.new_polymorphic_path(resource_class) do
+    def new_link(parent = nil)
+      link_to lotus_admin.new_polymorphic_path([parent, resource_class].compact) do
         content_tag(:i, nil, class: 'zmdi zmdi-plus-circle')
       end
     end
 
     def edit_link(resource)
-      link_to lotus_admin.edit_polymorphic_path(resource) do
+      link_to lotus_admin.edit_polymorphic_path(undecorated(resource)) do
         content_tag(:i, nil, class: 'zmdi zmdi-edit')
       end
     end
 
     def destroy_link(resource)
-      link_to lotus_admin.polymorphic_path(resource), data: { method: :delete, confirm: "Are you sure you want to remove this #{ resource.model_name.human }?" } do
+      link_to lotus_admin.polymorphic_path(undecorated(resource)), data: { method: :delete, confirm: "Are you sure you want to remove this #{ resource.model_name.human }?" } do
         content_tag(:i, nil, class: 'zmdi zmdi-delete')
       end
     end

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

@@ -1,15 +1,17 @@
-= material_form_for [lotus_admin, resource] do |f|
-  .form-inputs
-    - f.object.class.columns.each do |column|
-      - case column.type
-      - when :text
-        = f.input column.name, as: :text, input_html: { rows: 5 }
-      - else
-        - case column.name
-        - when /_at$/
-        - else
-          = f.input column.name
+.card
+  .card-body.card-padding
+    = material_form_for [lotus_admin, resource] do |f|
+      .form-inputs
+        - f.object.class.columns.each do |column|
+          - case column.type
+          - when :text
+            = f.input column.name, as: :text, input_html: { rows: 5 }
+          - else
+            - case column.name
+            - when /_at$/
+            - else
+              = f.input column.name
 
-  .form-actions
-    = material_form_submit(resource)
-    = material_form_cancel(lotus_admin.polymorphic_path(resource_class))
+      .form-actions
+        = material_form_submit(resource)
+        = material_form_cancel(lotus_admin.polymorphic_path(resource_class))

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

@@ -2,11 +2,6 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
-.card
-  .card-header
-    = t('.help', resource: resource_class.model_name.human)
-
-  .card-body.card-padding
-    = render 'form'
+= 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/new.html.haml

@@ -1,9 +1,4 @@
 .block-header
   %h2= page_title!("New #{ resource_class.model_name.human }")
 
-.card
-  .card-header
-    = t('.help', resource: resource_class.model_name.human)
-
-  .card-body.card-padding
-    = render 'form'
+= render 'form'

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/config/initializers/devise.rb

@@ -205,7 +205,7 @@ Devise.setup do |config|
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
-  config.reset_password_within = 6.hours
+  config.reset_password_within = 2.days
 
   # When set to false, does not sign a user in automatically after their password is
   # reset. Defaults to true, so a user is signed in automatically after a reset.

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.4.4'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.2
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-06-25 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