lotus_admin 1.5.3 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0009428266da5d0d9c3ea09cbbea1c6f4f2e7f09c9da6a5792c5f2891f9f7f09'
-  data.tar.gz: 8e0480793bc75ea33106336c1a5fb75d79c09ef1e93fc4b596c92761019fdf93
+  metadata.gz: 2831babc787ade51626bda751e5d640af336f640413a3d3a6cf8da991046a862
+  data.tar.gz: '09f3ba2f70b0350b68b9b7eba027c250730890a98261373db837cd6203e3b00d'
 SHA512:
-  metadata.gz: 7a92fecdde33a23f2fb010d551aaf90f3db1688d767c01154f0c6d6394a3adc3fa1092edc9575b9a4cce5375a7f8e18f3b1e0bb32241acf8b0d726a9f7f4c971
-  data.tar.gz: 5ffdaafacaba4d838bab07471d727614ff17cacd4da9fae3f75b3aab13254050be2986aa7b57fc80ff8ce0b7678161ee6e6a37637dea2bdf8fe362aa8e8c1c64
+  metadata.gz: aa99bfe18665c700aaf3083355e8a3369336338682bfd7e990fb797f9dc54fe8d9d17accdb1f5a152834e27e85d425b189d17c2138d94efe5d338f836b51b0e1
+  data.tar.gz: d64d541c9598fd6993a47f04554a6a32d674c7a3e9e9d2f6541b527ff933a27aa4dc53e576df547519c782d1f663c29998f8d048b76d58242ac67b8236e34989

data/app/controllers/lotus_admin/resource_controller.rb

@@ -32,7 +32,7 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
       format.html
 
       if block.present?
-        block.call
+        block.call(format)
       else
         if resource.save
           redirect_to after_create_redirect, notice: "Created new #{ resource_class.model_name.human } successfully"
@@ -56,13 +56,17 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
   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"
+    respond_to do |format|
+      format.html
+
+      if block.present?
+        block.call(format)
       else
-        render :edit
+        if resource.update(permitted_params)
+          redirect_to after_update_redirect, notice: "Updated #{ resource_class.model_name.human } successfully"
+        else
+          render :edit
+        end
       end
     end
   end
@@ -77,20 +81,34 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
     end
   end
 
-  def show
+  def show(&block)
     authorize(resource) if using_pundit?
+
+    respond_to do |format|
+      format.html
+
+      block.call(format) if block.present?
+    end
   end
 
-  def destroy
+  def destroy(&block)
     authorize(resource) if using_pundit?
 
-    if resource.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
+    respond_to do |format|
+      format.html
 
-    redirect_to after_destroy_redirect
+      if block.present?
+        block.call(format)
+      else
+        if resource.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 after_destroy_redirect
+      end
+    end
   end
 
   private

data/app/controllers/lotus_admin/users_controller.rb

@@ -12,7 +12,7 @@ module LotusAdmin
     filter :last_sign_in_at
 
     def create
-      super do
+      super do |format|
         resource.password = Devise.friendly_token.first(8)
 
         if resource.save

data/app/helpers/lotus_admin/link_helpers.rb

@@ -33,25 +33,25 @@ module LotusAdmin
     end
 
     def view_link(resource)
-      link_to lotus_admin.polymorphic_path(undecorated(resource)) do
+      link_to lotus_admin.polymorphic_path(undecorated(resource)), title: 'View Details' do
         content_tag(:i, nil, class: 'zmdi zmdi-eye')
       end
     end
 
     def new_link(parent = nil)
-      link_to lotus_admin.new_polymorphic_path([parent, resource_class].compact) do
+      link_to lotus_admin.new_polymorphic_path([parent, resource_class].compact), title: 'New' do
         content_tag(:i, nil, class: 'zmdi zmdi-plus-circle')
       end
     end
 
     def edit_link(resource)
-      link_to lotus_admin.edit_polymorphic_path(undecorated(resource)) do
+      link_to lotus_admin.edit_polymorphic_path(undecorated(resource)), title: 'Edit' do
         content_tag(:i, nil, class: 'zmdi zmdi-edit')
       end
     end
 
     def destroy_link(resource)
-      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
+      link_to lotus_admin.polymorphic_path(undecorated(resource)), title: 'Delete', 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/shared/filters/_modal.html.haml

@@ -1,5 +1,5 @@
 #filter-modal.modal.fade
-  .modal-dialog
+  .modal-dialog.modal-lg
     .modal-content
       = search_form_for ransack_object, url: collection_path, class: 'filter-form' do |f|
         .modal-header
@@ -9,8 +9,10 @@
           %h4.modal-title= t('lotus_admin.filters.modal.title')
 
         .modal-body
-          - filters.each do |filter|
-            = filter.render(f)
+          - filters.in_groups_of(2, false).each do |group|
+            .row
+              - group.each do |filter|
+                .col-sm-6= filter.render(f)
 
         .modal-footer
           = link_to t('lotus_admin.filters.modal.reset_btn'), collection_path, class: 'btn btn-link pull-left'

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.5.3'
+  VERSION = '1.5.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.8
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails