Merge branch '2.x' into compat-core-2962

Author: ramonski

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - #73 Compatibility with core#2962 (Remove RegulatoryInspector)
+- #74 Use flat_listing for the stored and past-retention sample listings
 - #71 Fix UnicodeDecodeError when running migrate_storage_facility_to_dx
 - #68 Require selection of retrieve reason when retrieving samples from storage
 - #67 Rename "Recover" transtion to "Retrieve" to align with ISO 17025/15189

src/senaite/storage/adapters/listing.py

@@ -98,6 +98,9 @@
             u"listing_samples_state_stored",
             default=u"Stored"
         ),
+        # flat pool: show every stored sample (partitions included) on its
+        # own row, without nesting them under their primary
+        "flat_listing": True,
         "contentFilter": {
             "review_state": ("stored",),
             "sort_on": "created",
@@ -112,6 +115,9 @@
             u"listing_samples_state_past_retention",
             default=u"Past Retention"
         ),
+        # flat pool: show every stored sample (partitions included) on its
+        # own row, without nesting them under their primary
+        "flat_listing": True,
         "contentFilter": {
             "review_state": ("stored",),
             "sort_on": "getStorageExpiryDate",
@@ -139,7 +145,6 @@ def __init__(self, listing, context):
         self.listing = listing
         self.context = context
         self.installed = is_installed()
-        self.flat_listing = False
 
     @property
     def warning_days_before_expiration(self):
@@ -164,10 +169,10 @@ def before_render(self):
         # Additional custom transitions
         map(self.add_custom_transition, ADD_CUSTOM_TRANSITIONS)
 
-        # In "stored" status, display all samples in "flat style"
-        if self.is_stored_state():
-            self.flat_listing = True
-            self.listing.contentFilter.pop("isRootAncestor", None)
+        # The "stored" and "past_retention" review states are flagged as
+        # flat listings (see their `flat_listing` key), so senaite.core drops
+        # the root-ancestor restriction and renders every stored sample,
+        # partitions included, on its own row without nesting.
 
         # Update the contentFilter of the "past_retention" filter, so only
         # stored samples whose retention period has passed are displayed