Merge branch '2.x' into fix-save-button-visibility-in-sampleheader

Author: xispa

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - #2874 Fix save button visibility of sample header
+- #2875 Fix AttributeError in add_sample when rejection workflow is enabled
 - #2872 Use AT accessor/mutator in GenericSetup field adapter
 - #2870 Do a full commit every 1000 migrated worksheets
 - #2869 Add adapter lookup for client searchable text index

src/bika/lims/browser/widgets/rejectionwidget.py

@@ -19,15 +19,10 @@
 # Some rights reserved, see README and LICENSE.
 
 from AccessControl import ClassSecurityInfo
+from bika.lims import api
 from Products.Archetypes.Registry import registerWidget
 from Products.Archetypes.Widget import TypesWidget
 
-try:
-    from zope.component.hooks import getSite
-except Exception:
-    # Plone < 4.3
-    from zope.app.component.hooks import getSite
-
 
 class RejectionWidget(TypesWidget):
     _properties = TypesWidget._properties.copy()
@@ -53,22 +48,8 @@ def isVisible(self, instance, mode='view', default=None, field=None):
 
     def rejectionOptionsList(self):
         "Return a sorted list with the options defined in bikasetup"
-        plone = getSite()
-        settings = plone.bika_setup
-        # RejectionReasons will return something like:
-        # [{'checkbox': u'on', 'textfield-2': u'b', 'textfield-1': u'c', 'textfield-0': u'a'}]
-        if len(settings.RejectionReasons) > 0:
-            reject_reasons = settings.RejectionReasons[0]
-        else:
-            return []
-        sorted_keys = sorted(reject_reasons.keys())
-        if 'checkbox' in sorted_keys:
-            sorted_keys.remove('checkbox')
-        # Building the list with the values only because the keys are not needed any more
-        items = []
-        for key in sorted_keys:
-            items.append(reject_reasons[key].strip())
-        return items
+        setup = api.get_senaite_setup()
+        return setup.getRejectionReasons()
 
     def isRejectionEnabled(self, dd):
         """