five-two-nw-olivander 0.1.2.47 → 0.1.2.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38a3998950369b24606d91effaa34d2b306b9a16fcf8ef9f8ff3f91c11039a1
-  data.tar.gz: c5d1f30f64cd53b333e4c42c34307cc16880e42b1a836857ad7c7589ad7f6588
+  metadata.gz: 002fba1f117b2435491c2b6627f1124a77f5fe03abe8bb892ee55ca5ce84c999
+  data.tar.gz: 33692e5979bc9cf09671052eebaaede0cbf15261f6ec6f2f07b889ecdee08d10
 SHA512:
-  metadata.gz: 7cdebfcdf720aeb564ae713293a4ec5fd4e31efe5fb6dbb743499ef9d2bedd08d309cbdcdea0a765c960ea042495885e7465d0194dc13a0631dc5fad34c5e1a8
-  data.tar.gz: f1fb914c35ddc747c5b85c41fa2f5f5c14d9dfba07a87abfc07993dee9424f285663197c804f461247afece637602f934be4838703ef006244f6ba8025c8243e
+  metadata.gz: 49cd7121ce896cca2e054b6e9b1f8e0ce96eb4835c2d639f0a5aca8c9e69780c785114755c55ada48050fa0c792d8fe58334ec7393a9215ad259fb480904c8c3
+  data.tar.gz: 9ffca213dde223e5ecda96b698d2ee3015c1ad8f794609c67705a9b95577f39a1e475a85e0893cf01a160a130e9e40091e485f689265df7a43ca1ec438be3402

data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb

@@ -63,7 +63,7 @@ module Olivander
 
               next unless respond_to?(:attachment_definitions)
 
-              attachment_definitions.filter{ |x| puts x; puts inc; x == inc }.each do |ad|
+              attachment_definitions.filter{ |x| x == inc }.each do |ad|
                 resource_field ad[0], :file
               end
             end

data/app/helpers/olivander/application_helper.rb

@@ -25,10 +25,16 @@ module Olivander
       routed_resource = route_builder.resources[plural_name.to_sym]
       return [] if routed_resource.nil?
 
-      actions = resource.is_a?(Class) ?
-        (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.select{ |x| !x.crud_action }) : 
-        (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions.select{ |x| !x.crud_action }): [])
-      actions = actions.reject{ |a| a.sym == for_action || !EffectiveDatatables.authorization_method.call(controller, a.sym, resource) }
+      actions = if resource.is_a?(Class)
+                  routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.reject(&:crud_action)
+                else
+                  if resource.persisted?
+                    routed_resource.persisted_crud_actions | routed_resource.member_actions.reject(&:crud_action)
+                  else
+                    []
+                  end
+                end
+      actions = actions.select{ |a| authorized_resource_action?(a.sym, resource, for_action) }
       preferred = %i[show edit destroy]
       [].tap do |arr|
         preferred.each do |p|
@@ -42,6 +48,12 @@ module Olivander
       end
     end
 
+    def authorized_resource_action?(action, resource, except = nil)
+      return false if action == except
+
+      respond_to?('can?') ? can?(action, resource) : true
+    end
+
     def resource_form_actions(route_builder, resource, for_action: :show)
       render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(route_builder, resource, for_action: for_action).select(&:show_in_form) }
     end

data/app/views/application/_form.html.haml

@@ -1,4 +1,4 @@
-- read_only = action_name != 'edit'
+- read_only = !%w[edit new].include?(action_name)
 = simple_form_for(@resource) do |f|
   .card.card-primary
     .card-header
@@ -8,7 +8,9 @@
     .card-body
       =f.error_notification
       =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?
+      = render_optional_partial 'form_inside_before'
       = render Olivander::Components::ResourceFormComponent.new(@resource, f)
+      = render_optional_partial 'form_inside_after'
     .card-footer.text-right
       = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
       - unless read_only

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -23,9 +23,11 @@
 :javascript
   $(document).ready(function(){
     function getUrl() {
-      const reg = /\/new|\/[0-9]+[\/edit]*/,
-            url = "" + window.location;
-      return url.replace(reg, '');
+      const locationUrl = new URL(window.location),
+            reg = /\/new|\/[0-9]+[\/edit]*/;
+      
+      locationUrl.pathname = locationUrl.pathname.replace(reg, '')
+      return locationUrl.href;
     }
     const url = getUrl();
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.47'.freeze
+  VERSION = '0.1.2.49'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.47
+  version: 0.1.2.49
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick