lotus_admin 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5052f9e0e3aaf32f8b1dfcf66be5501f293ffdd683ad13c1c570177dce11f6
-  data.tar.gz: 0dbbb116f2aae45ae698a81d7ae214af02dc339d5875124fc910271fa0115b9d
+  metadata.gz: 7e2839eadd3d807d7f63aa27610bf50cf6ae68f5ec2c1e190dfdbc6d7fa3c99d
+  data.tar.gz: 1ab3e70e9768567e637abb6b12540f72b59d149e670285a80c12818ac653ef60
 SHA512:
-  metadata.gz: a9c4c4102df48541806b92fad477bc7c4be8e6d855e23fd0462f9a85ec06fee0b4723b793484f9195675b46ad27efcbb08a13910ec323f64d041a21bcb5fe9ed
-  data.tar.gz: 3cd4e662aa85bf6c4e66b1c34d6f7f694ae4015e4edf05587c5aa77bf894c25a2206fa01475e504b36809062d4ec3c45449c06d83cf8a0cf83b0a8d0de5499ee
+  metadata.gz: f5fa87aa1f1b1079fe2ef539a4f47fb71130d0235d8ee600b11d92ec7ca6d7e0f494114a139c2508026e8a4acc05671581203341048044972902073c30ac2531
+  data.tar.gz: c6218ec394eff9c3fc35bbede5c7ddc84e7523acf32c04cace6f9cf5b59f8fb2d79c62d378bba417a66e1934791fd69cbbcc0cceab21cb72473cfcd0fb87404c

data/app/controllers/lotus_admin/resource_controller.rb

@@ -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
+
+      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
+        redirect_to after_destroy_redirect
+      end
+    end
   end
 
   private

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.4'
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 6.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 6.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -525,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Bootstrap 3 Material Design Simple Admin Interface.