Merge pull request #49 from AtlasSystems/feature/33341/ContainersOnly

Correctly handle requests_permitted_for_containers_only

Author: asmith-atlas

Readme.md

@@ -1,8 +1,8 @@
 # ArchivesSpace Request Fulfillment via Aeon
 
-**Version:** 20241210
+**Version:** 20250617
 
-**Last Updated:** December 10, 2024
+**Last Updated:** June 17, 2025
 
 
 ## Table of Contents
@@ -162,6 +162,8 @@ ArchivesSpace may cause changes in the functionality of this plugin.
     - Fixed a bug that caused a login loop when `:top_container_mode` is false. 
     Rather than using action=11&type=200 in this case, the AeonForm is specified as 
     ExternalRequest with a hidden input instead.
+- **20250617**
+    - Fixed a bug that prevented the plugin from correctly handling the `:requests_permitted_for_containers_only` setting when `:top_container_mode` is false.
 
 ## Requirements
 

public/models/aeon_record_mapper.rb

@@ -92,7 +92,7 @@ def unrequestable_display_message
             else
                 return "Not requestable"
             end
-        elsif !self.record_has_top_containers?
+        elsif !self.record_has_top_containers? && (self.repo_settings[:requests_permitted_for_containers_only] == true || self.repo_settings[:top_container_mode] == true)
             if (message = self.repo_settings[:no_containers_message])
                 return message
             else
@@ -117,14 +117,16 @@ def configured?
     def hide_button?
         # returning false to maintain the original behavior
         return false unless self.repo_settings
-
+        
         if self.repo_settings[:hide_request_button]
             return true
         elsif (self.repo_settings[:hide_button_for_accessions] == true && record.is_a?(Accession))
             return true
         elsif self.requestable_based_on_archival_record_level? == false
             return true
-        elsif self.record_has_top_containers? == false
+        elsif self.repo_settings[:top_container_mode] == true && self.record_has_top_containers? == false
+            return true
+        elsif self.repo_settings[:requests_permitted_for_containers_only] == true && self.record_has_top_containers? == false
             return true
         elsif self.record_has_restrictions? == true
             return true