lotus_admin 1.5.1 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 045cf584020f6a9ddb26bb32732a6c34d0a562d2691351fea2748acc07930140
-  data.tar.gz: 7cb526a8e6abc0d62357d47d394a4d83b8ac02ebd6c31c42b1b464e7872911c0
+  metadata.gz: 9722e072421aa225525f1705c81d9c2fe9e99d62855019955eb1426b3f59f502
+  data.tar.gz: 73d6a3ab005224e36ab8c3ee9ec043cd891fa22a12930dbd75b46743420988b4
 SHA512:
-  metadata.gz: fa06a04c853e7412efdc49d4f4f6b821cb8638dc962a485549881fbdb68ecd19a505ccb379405de262f2f3387186fdcfc8253daf0b23aebd3680d910c28da14c
-  data.tar.gz: 61f92a76cfeedbd9e1d0d1353961716207baa72d10a7fece3dacd65d6e239902d94d107ae4ef52b4b07f9b229b94e73a44d3db9ae292ca09057116f43ff2fdb9
+  metadata.gz: 1d71e3209dcc0d0598fda166312c87d71ec7bab0bfbdbca990b7425ef208f691efced1b4e886eac145c400050eff4dad52a7ec2d6b0ad147847cf3267dadd224
+  data.tar.gz: 5f42cbcc462a5c95691cf85b4b713b9291be648f544ee425a9774739075e575ddcec5b38bc98ea8d46ff59a8ba21e21ed0f6f427f5a53dca433dbd1e78a74d67

data/app/assets/javascripts/lotus_admin/datepickers.js.coffee

@@ -12,14 +12,13 @@ $ ->
   }
 
   setup_datepickers = (container)->
-    container.find('.input-group.date, .form-control.date').datetimepicker
+    container.find('.input-group.date').datetimepicker
       format: 'YYYY-MM-DD',
       icons: icons
 
-    container.find('.input-group.datetime, .form-control.datetime').datetimepicker
+    container.find('.input-group.datetime').datetimepicker
       format: 'YYYY-MM-DD hh:mm a',
-      icons: icons,
-      debug: true
+      icons: icons
 
   # On page load
   setup_datepickers($('body'))

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

@@ -4,6 +4,10 @@ module LotusAdmin
       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) }
@@ -29,7 +33,7 @@ module LotusAdmin
     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
@@ -41,13 +45,13 @@ module LotusAdmin
     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/inputs/currency_input.rb

@@ -0,0 +1,22 @@
+class CurrencyInput < SimpleForm::Inputs::Base
+  def input(wrapper_options)
+    currency = options.delete(:currency) || default_currency
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    content_tag(:div, input_group(currency, merged_input_options), class: "input-group")
+  end
+
+  private
+
+  def input_group(currency, merged_input_options)
+    "#{currency_addon(currency)} #{@builder.text_field(attribute_name, merged_input_options)}".html_safe
+  end
+
+  def currency_addon(currency)
+    content_tag(:span, currency, class: "input-group-addon")
+  end
+
+  def default_currency
+    "$"
+  end
+end

data/app/inputs/date_time_input.rb

@@ -0,0 +1,28 @@
+class DateTimeInput < SimpleForm::Inputs::Base
+  def input(wrapper_options)
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    content_tag(:div, input_group(merged_input_options), class: "input-group datetime")
+  end
+
+  private
+
+  def input_group(merged_input_options)
+    "#{calendar_addon} #{@builder.text_field(attribute_name, merged_input_options)}".html_safe
+  end
+
+  def calendar_addon
+    content_tag(:span, calendar_icon, class: "input-group-addon")
+  end
+
+  def calendar_icon
+    @builder.template.fa_icon(:calendar)
+  end
+
+  def input_html_options
+    super.merge({
+      class: 'datetime',
+      value: @builder.object.public_send(attribute_name)&.strftime('%Y-%m-%d %l:%M %P')
+    })
+  end
+end

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.5.1'
+  VERSION = '1.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.6
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -405,7 +405,9 @@ files:
 - app/helpers/lotus_admin/panel_helpers.rb
 - app/helpers/lotus_admin/render_helpers.rb
 - app/helpers/lotus_admin/sidebar_helpers.rb
+- app/inputs/currency_input.rb
 - app/inputs/date_picker_input.rb
+- app/inputs/date_time_input.rb
 - app/jobs/lotus_admin/application_job.rb
 - app/mailers/lotus_admin/application_mailer.rb
 - app/mailers/lotus_admin/user_mailer.rb