lotus_admin 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f875dee3e17523cc5bbfa81c52e4b9fe17cb8c6cc3bb2616edd8178b1c084ee2
-  data.tar.gz: 6180d4fe36ed58adffee854b395836ca62cbd3917956db8632464263db53b449
+  metadata.gz: f6f28169cb1da38743faa9e32ed4399425d5dc3ddc1b95831ca6cef5725351db
+  data.tar.gz: 518d70fd6adf87fc29a924fcd011f9f239b086695f4322fcea93a51f25e35e06
 SHA512:
-  metadata.gz: fb90f06dc01af25524ad013876c92fd8a38ab6786a42f3a98fc0092784aab930c21154d023ba5f8d4703521545925a0edbd52420db7b13e4c9f59b3c3b85603c
-  data.tar.gz: b844b0fbaf29cbabba47a12965f6c61ba7021b65ce37fbc007816903d3d339a00554c644954358b2ba6e883c213704337124a2a53cfc716c8b43783c50d4f5ad
+  metadata.gz: 57d246263ad9d3b2c37bfb3ff94e8af6c21b77339700bd6039e48ded5396ae6cd17f391a34c8fe0265cad35965468fea88961f56baa6c5f7846cc8c5b4f3dbe1
+  data.tar.gz: d3a4bcb8258f941942c5397a9b1f871f4a87b35fc5ea2da5228f539eb1ed69ca90b8c58d3794731aeee6a881f52e09d85cd69145be47b5640496a4120b87d2fe

data/app/controllers/lotus_admin/resource_controller.rb

@@ -15,31 +15,45 @@ 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 [lotus_admin, resource], 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 update(&block)
     authorize(resource) if using_pundit?
 
-    if resource.update(permitted_params)
-      redirect_to [lotus_admin, resource], notice: "Updated new #{ resource_class.model_name.human } successfully"
+    if block.present?
+      block.call
     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
 
@@ -66,7 +80,7 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
       flash[:error] = "There was an error removing that #{ resource_class.model_name.human }"
     end
 
-    redirect_to [lotus_admin, resource_class]
+    redirect_to after_destroy_redirect
   end
 
   private
@@ -82,4 +96,16 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
   def set_view_paths
     append_view_path("lotus_admin/resource/#{ action_name }")
   end
+
+  def after_update_redirect
+    [lotus_admin, resource]
+  end
+
+  def after_create_redirect
+    after_update_redirect
+  end
+
+  def after_destroy_redirect
+    [lotus_admin, resource_class]
+  end
 end

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

@@ -6,8 +6,8 @@ module LotusAdmin
       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

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

@@ -4,9 +4,4 @@
   %ul.actions
     %li= new_link
 
-.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/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/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/form_builder.rb

@@ -18,8 +18,10 @@ class LotusAdmin::FormBuilder < SimpleForm::FormBuilder
     end
 
     case type
-    when :grouped_select, :select, :date
+    when :date
       options[:label] = options[:placeholder]
+    when :grouped_select, :select
+      options[:include_blank] = "Choose #{ options[:placeholder] }..."
     end
 
     super

data/lib/lotus_admin/version.rb

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

data/vendor/assets/stylesheets/lotus_admin/theme/inc/mixin.scss

@@ -141,7 +141,7 @@
         background-color: #FFF;
         background-position: right #{"calc(100% - 7px)"};
         background-repeat: no-repeat;
-        @include img-retina('../img/select.png', '../img/select$2x.png', 12px, 12px);
+        // @include img-retina('../img/select.png', '../img/select$2x.png', 12px, 12px);
         pointer-events: none;
         z-index: 5;
     }

metadata

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