plutonium 0.19.3 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90334ca76362d14c0666cc221dda19671f8ded4348f65e61e7a0044251dbf153
-  data.tar.gz: 9e941a439c725b2df639d0c48f3dbdaed1f73abcc515ef4cff938653ce8cadcd
+  metadata.gz: b27651d25eebb89d108051b5f2afb8f1703587eb91c84207cc4ec0862b4d45c2
+  data.tar.gz: 44e3394e35c5f2fe1c811a29697fc7e59e7224e296a8d2fdb707c33098a85eca
 SHA512:
-  metadata.gz: 45c602ae6961272dde234ede40560e832f9d5ae81244d284c0691f17989ac4d64cf33a4f7fab3a7a7c57ec433fdd01d289ff1c4add954cab54673dfc1b420472
-  data.tar.gz: b837a486e11096bc39678e4dcf3ca0a854f3718bbc6fc5c09cf8ab56400555bee09d074ecab7fdd797289ac61bcd36fd8a26d546761a390f0f5118156ff895ab
+  metadata.gz: c9ad4898ae89e4e0095a802357a2f4323c3025bc0bc7f2fb9543829ee23923f08ae632e764df357d3ce29a23a53a151a6399f2c7fd2c6d90b01ce21f3c5d7b3c
+  data.tar.gz: 06b6ecf29c1e65831a5f40dcc8d32a6110aa02e24ddadc053bc40e88cebd0230738854d11e40e5e29b770df0fe6f4b8b39d684d732b497f3503f41401cd5ee1a

data/lib/plutonium/resource/controller.rb

@@ -128,11 +128,7 @@ module Plutonium
         @current_parent ||= begin
           parent_route_key = parent_route_param.to_s.gsub(/_id$/, "").to_sym
           parent_class = current_engine.resource_register.route_key_lookup[parent_route_key]
-          parent_scope = if scoped_to_entity?
-            parent_class.associated_with(current_scoped_entity)
-          else
-            parent_class.all
-          end
+          parent_scope = authorized_scope(parent_class.all, context: {entity_scope: entity_scope_for_authorize})
           parent_scope = parent_scope.from_path_param(params[parent_route_param])
           current_parent = parent_scope.first!
           authorize! current_parent, to: :read?

data/lib/plutonium/resource/controllers/presentable.rb

@@ -13,9 +13,10 @@ module Plutonium
         def presentable_attributes
           @presentable_attributes ||= begin
             presentable_attributes = permitted_attributes
-            if current_parent
+            if current_parent && !present_parent?
               presentable_attributes -= [parent_input_param, :"#{parent_input_param}_id"]
-            elsif scoped_to_entity?
+            end
+            if scoped_to_entity? && !present_scoped_entity?
               presentable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"]
             end
             presentable_attributes
@@ -25,8 +26,12 @@ module Plutonium
         def submittable_attributes
           @submittable_attributes ||= begin
             submittable_attributes = permitted_attributes
-            submittable_attributes -= [parent_input_param, :"#{parent_input_param}_id"] if current_parent
-            submittable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"] if scoped_to_entity?
+            if current_parent && !submit_parent?
+              submittable_attributes -= [parent_input_param, :"#{parent_input_param}_id"]
+            end
+            if scoped_to_entity? && !submit_scoped_entity?
+              submittable_attributes -= [scoped_entity_param_key, :"#{scoped_entity_param_key}_id"]
+            end
             submittable_attributes
           end
         end
@@ -42,6 +47,14 @@ module Plutonium
         def build_form(record = resource_record!)
           current_definition.form_class.new(record, resource_fields: submittable_attributes, resource_definition: current_definition)
         end
+
+        def present_parent? = false
+
+        def present_scoped_entity? = false
+
+        def submit_parent? = present_parent?
+
+        def submit_scoped_entity? = present_scoped_entity?
       end
     end
   end

data/lib/plutonium/ui/display/resource.rb

@@ -48,7 +48,7 @@ module Plutonium
 
             title = object.class.human_attribute_name(name)
             src = case reflection.macro
-            when :belongs_to
+            when :belongs_to, :has_one
               associated = object.public_send name
               resource_url_for(associated, parent: nil) if associated
             when :has_many

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.19.3"
+  VERSION = "0.19.5"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.5
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-21 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk