lotus_admin 1.4.5 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7abae8eb4be2f4c119e4cf91add400abb366b444879111eb93073462db7e1b16
-  data.tar.gz: 39bdbb6e979939f91d18b25ed5a8e162227fc0ed13c1df55d69549e18096807c
+  metadata.gz: '0009428266da5d0d9c3ea09cbbea1c6f4f2e7f09c9da6a5792c5f2891f9f7f09'
+  data.tar.gz: 8e0480793bc75ea33106336c1a5fb75d79c09ef1e93fc4b596c92761019fdf93
 SHA512:
-  metadata.gz: f8ae4a120f198c54cf944d7b9d995e7acfc0f691bd7a2dbef33ee6c0766643c9e8082ade919efe23d282ab7d9d26961f7e9f4c84ff7107f7b3ad039ca8ed509a
-  data.tar.gz: 07c53d084ada45c620c1d9626a638706ecf6127c78c1c90cac10e2869e04e3b525d12717b95ae7e3ec06e578480d780c2e7d605bd98a97c72a5264b55a7b90e8
+  metadata.gz: 7a92fecdde33a23f2fb010d551aaf90f3db1688d767c01154f0c6d6394a3adc3fa1092edc9575b9a4cce5375a7f8e18f3b1e0bb32241acf8b0d726a9f7f4c971
+  data.tar.gz: 5ffdaafacaba4d838bab07471d727614ff17cacd4da9fae3f75b3aab13254050be2986aa7b57fc80ff8ce0b7678161ee6e6a37637dea2bdf8fe362aa8e8c1c64

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

@@ -43,6 +43,16 @@ class LotusAdmin::ResourceController < LotusAdmin::AuthenticatedController
     end
   end
 
+  def edit(&block)
+    authorize(resource) if using_pundit?
+
+    if block.present?
+      block.call
+    else
+      render :edit
+    end
+  end
+
   def update(&block)
     authorize(resource) if using_pundit?
 

data/app/helpers/lotus_admin/link_helpers.rb

@@ -1,25 +1,57 @@
 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
 
-    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
 
     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/_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

@@ -2,11 +2,6 @@
   %h2= page_title!("Edit #{ resource_class.model_name.human }")
 
   %ul.actions
-    %li= new_link
+    = new_resource_item
 
-.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/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/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/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/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/version.rb

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

metadata

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