lotus_admin 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3ca80072d89b813035c6b9362226840dd8acefa668e97002c2cbb142998b9d
-  data.tar.gz: 1a275b54e059f89ee5384a40fb5fcf697440c1195ada84d50e071d2e31dd3e77
+  metadata.gz: 7abae8eb4be2f4c119e4cf91add400abb366b444879111eb93073462db7e1b16
+  data.tar.gz: 39bdbb6e979939f91d18b25ed5a8e162227fc0ed13c1df55d69549e18096807c
 SHA512:
-  metadata.gz: 90247f44db4b6b0785556c8469c6b1aa62c5e3c45db85213a41b7449bbd02b914981fdda3f76e823349236d902289f52ee9e396adcd3bc4157f17949667e76eb
-  data.tar.gz: 2b4d3029f59c37c53fd14b213102d870a597ba33096965d4021d7632b8f7ce284691fce30eace6031a1c51c686e8328e724e69fb927050fe50cc65a0282ddc02
+  metadata.gz: f8ae4a120f198c54cf944d7b9d995e7acfc0f691bd7a2dbef33ee6c0766643c9e8082ade919efe23d282ab7d9d26961f7e9f4c84ff7107f7b3ad039ca8ed509a
+  data.tar.gz: 07c53d084ada45c620c1d9626a638706ecf6127c78c1c90cac10e2869e04e3b525d12717b95ae7e3ec06e578480d780c2e7d605bd98a97c72a5264b55a7b90e8

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 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 update(&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
+      if resource.update(permitted_params)
+        redirect_to after_update_redirect, notice: "Updated #{ resource_class.model_name.human } successfully"
+      else
+        render :edit
+      end
     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/lib/lotus_admin/version.rb

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

metadata

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