Prepare 3.2.1rc2 (#2235)

* Use the object to make the item (#2234) * Prepare for 3.2.1rc2
bikalims · Sep 15, 2017 · b3e66b9 · b3e66b9
1 parent d2555dc
commit b3e66b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bika/lims/browser/bika_listing.py b/bika/lims/browser/bika_listing.py
@@ -849,12 +849,12 @@ def get_type_title(self, obj):
         return fti.Title()
 
     @cache(api.bika_cache_key_decorator, store_on_context)
-    def make_listing_item(self, brain):
+    def make_listing_item(self, obj):
         """Returns an object dictionary suitable for the listing view
         """
 
         # ensure we have an object
-        obj = api.get_object(brain)
+        obj = api.get_object(obj)
 
         # prepare some data
         id = api.get_id(obj)
@@ -1045,7 +1045,7 @@ def folderitems(self, full_objects=False):
                 continue
 
             # create a listing item
-            results_dict = self.make_listing_item(brain)
+            results_dict = self.make_listing_item(obj)
 
             # Search for values for all columns in obj
             for key in self.columns.keys():

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -1,6 +1,7 @@
-3.2.1rc2 (unreleased)
+3.2.1rc2 (2017-09-15)
 ---------------------
 
+- Issue-2234: Use the object to create the cached listing item
 - Issue-2219: Copied ARs are created in random order
 - Issue-2214: AR Add Controls need to be styled correctly