lotus_admin 1.5.0 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f28169cb1da38743faa9e32ed4399425d5dc3ddc1b95831ca6cef5725351db
-  data.tar.gz: 518d70fd6adf87fc29a924fcd011f9f239b086695f4322fcea93a51f25e35e06
+  metadata.gz: 7e57539d667b82f3e4212841eb753c5ad31c65c7c3e67ebb38660032f56c1a4e
+  data.tar.gz: 965da47c55f3f89e867fc4baa338013c49b896712db2eb1b146869dba1f0aa95
 SHA512:
-  metadata.gz: 57d246263ad9d3b2c37bfb3ff94e8af6c21b77339700bd6039e48ded5396ae6cd17f391a34c8fe0265cad35965468fea88961f56baa6c5f7846cc8c5b4f3dbe1
-  data.tar.gz: d3a4bcb8258f941942c5397a9b1f871f4a87b35fc5ea2da5228f539eb1ed69ca90b8c58d3794731aeee6a881f52e09d85cd69145be47b5640496a4120b87d2fe
+  metadata.gz: ae1f254edaa96c81589c526b955d2f099768a69b68999ddd8155b1e0f414cbf72f266ea3922765add1059c3a340f2fa26ade8e978871c2f6717f8b8be5621dae
+  data.tar.gz: 27e4aef7ba354a1c039eb6bc4aef087e8477aef3ab6d537b147f26f9ece1a90a55568da42b4152ad927bf658092aaea95537e115fb55471b2fac3e256f279dcf

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"
@@ -43,16 +43,30 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
     end
   end
 
-  def update(&block)
+  def edit(&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"
+      render :edit
+    end
+  end
+
+  def update(&block)
+    authorize(resource) if using_pundit?
+
+    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

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

@@ -1,7 +1,39 @@
 module LotusAdmin
   module LinkHelpers
+    def default_table_actions_column(resource)
+      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) }
+      end
+    end
+
+    def new_resource_item(parent = nil)
+      if policy(resource_class).new?
+        content_tag(:li) { new_link(parent) }
+      end
+    end
+
+    def edit_resource_item(resource)
+      if policy(resource).edit?
+        content_tag(:li) { edit_link(resource) }
+      end
+    end
+
+    def destroy_resource_item(resource)
+      if policy(resource).destroy?
+        content_tag(:li) { destroy_link(resource) }
+      end
+    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
@@ -13,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/app/views/lotus_admin/resource/edit.html.haml

@@ -2,6 +2,6 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
 = render 'form'

data/app/views/lotus_admin/resource/index.html.haml

@@ -1,5 +1,5 @@
 - content_for :action_items do
-  %li= new_link
+  = new_resource_item
 
 = render_index do
   .table-responsive
@@ -12,8 +12,4 @@
         - collection.each do |resource|
           %tr
             %td= link_to resource.id, [lotus_admin, resource]
-            %td.actions-col
-              %ul.actions
-                %li= view_link(resource)
-                %li= edit_link(resource)
-                %li= destroy_link(resource)
+            = default_table_actions_column(resource)

data/app/views/lotus_admin/resource/show.html.haml

@@ -2,9 +2,9 @@
   %h2= page_title!("#{ resource_class.model_name.human } Details")
 
   %ul.actions
-    %li= edit_link(resource)
-    %li= destroy_link(resource)
-    %li= new_link
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)
+    = new_resource_item
 
 .card
   .card-header

data/app/views/lotus_admin/shared/table/_actions.html.haml

@@ -0,0 +1,5 @@
+%td.actions-col
+  %ul.actions
+    = view_resource_item(resource)
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)

data/app/views/lotus_admin/users/edit.html.haml

@@ -2,7 +2,7 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
 .card
   .card-header

data/app/views/lotus_admin/users/index.html.haml

@@ -1,5 +1,5 @@
 - content_for :action_items do
-  %li= new_link
+  = new_resource_item
 
 = render_index do
   .table-responsive
@@ -20,6 +20,6 @@
             %td= user.email
             %td.actions-col
               %ul.actions
-                %li= view_link(user)
-                %li= edit_link(user)
-                %li= destroy_link(user)
+                = view_resource_item(user)
+                = edit_resource_item(user)
+                = destroy_resource_item(user)

data/app/views/lotus_admin/users/show.html.haml

@@ -2,8 +2,8 @@
   %h2= page_title!("#{ resource_class.model_name.human } Details")
 
   %ul.actions
-    %li= edit_link(resource)
-    %li= destroy_link(resource)
+    = edit_resource_item(resource)
+    = destroy_resource_item(resource)
 
 .card
   .card-header

data/lib/lotus_admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.5
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-06 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
@@ -453,6 +455,7 @@ files:
 - app/views/lotus_admin/shared/_index.html.haml
 - app/views/lotus_admin/shared/filters/_modal.html.haml
 - app/views/lotus_admin/shared/filters/_results_banner.html.haml
+- app/views/lotus_admin/shared/table/_actions.html.haml
 - app/views/lotus_admin/user_mailer/invited.html.haml
 - app/views/lotus_admin/user_mailer/invited.text.erb
 - app/views/lotus_admin/users/_form.html.haml