lotus_admin 1.5.2 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6d6f7dab65888fc3cc1d0c1823baa23eb80d80605bc11c292bccff92f2242a
-  data.tar.gz: 72edd101b774056720d793cbab45c79f52519add43976762c1a32f1962719037
+  metadata.gz: 405663dd13d84a5fd217a3fc71842b5c63d22bc856cb65c15cb13e327ce179d3
+  data.tar.gz: c7814206b4315499b7fda282ac5f5f16907d9aef34da98ce0f99688df1125a32
 SHA512:
-  metadata.gz: 442cdf1f5eaf5ee45be321bfdf1dcbd0cf503101abf3a1f441e98521bb3d70a37b802e6526319edac810f46932ece767d389290fb379a27ff73ba87f917ed2f2
-  data.tar.gz: 7427bb13393baf8774e1be6bdc0613bccec45baaac602fb718e8abdedc659c4219bef7ad0b09b94a6c8a0e3bc7da890271635a2d6ca836b01513819512fb9f7c
+  metadata.gz: 5c63ad4deab968e1c514c7d918ffc7a8fa6e712af61f91a40c8cd7a0e5724fd1f302c21ea3cfb9cb56bd683ba4364d189870e653acc288001cf2d2bf71090f8b
+  data.tar.gz: 6b7746e4d804def2a2b49fcf1254a3ec53bd4e4740fcac24bd7ea7907d54c21a801da5b6f273da96915aec227bbf834aa70924a166a4114558a7f83fc0a9e1da

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/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/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.2'
+  VERSION = '1.5.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.7
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-02 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