Fix reference widget lookups

CHANGES.rst

@@ -4,6 +4,7 @@ Changelog
 2.5.0 (unreleased)
 ------------------
 
+- #2384 Fix reference widget lookups
 - #2379 Add listing adapter for sample workflow "receive" transition
 - #2382 Fix missing fields in client edit mode and listing
 - #2378 Reactivate auditlog catalog mappings

src/bika/lims/api/__init__.py

@@ -1062,7 +1062,8 @@ def get_review_status(brain_or_object):
     :returns: Value of the review_status variable
     :rtype: String
     """
-    if is_brain(brain_or_object):
+    if is_brain(brain_or_object) \
+       and base_hasattr(brain_or_object, "review_state"):
         return brain_or_object.review_state
     return get_workflow_status_of(brain_or_object, state_var="review_state")
 

src/bika/lims/content/abstractbaseanalysis.py

@@ -51,10 +51,8 @@
 from Products.Archetypes.Widget import SelectionWidget
 from Products.Archetypes.Widget import StringWidget
 from Products.CMFCore.permissions import View
-from Products.CMFCore.utils import getToolByName
 from senaite.core.browser.fields.records import RecordsField
 from senaite.core.catalog import SETUP_CATALOG
-from senaite.core.p3compat import cmp
 from zope.interface import implements
 
 # Anywhere that there just isn't space for unpredictably long names,
@@ -419,20 +417,22 @@
 # The category of the analysis service, used for filtering, collapsing and
 # reporting on analyses.
 Category = UIDReferenceField(
-    'Category',
+    "Category",
     schemata="Description",
     required=1,
-    allowed_types=('AnalysisCategory',),
-    vocabulary='getAnalysisCategories',
+    allowed_types=("AnalysisCategory",),
     widget=ReferenceWidget(
-        label=_("Analysis Category"),
-        description=_("The category the analysis service belongs to"),
-        showOn=True,
-        catalog_name=SETUP_CATALOG,
-        base_query={
-            'is_active': True,
-            'sort_on': 'sortable_title',
-            'sort_order': 'ascending',
+        label=_(
+            "label_analysis_category",
+            default="Analysis Category"),
+        description=_(
+            "description_analysis_category",
+            default="The category the analysis service belongs to"),
+        catalog=SETUP_CATALOG,
+        query={
+            "is_active": True,
+            "sort_on": "sortable_title",
+            "sort_order": "ascending",
         },
     )
 )
@@ -475,20 +475,27 @@
 # The analysis service's Department.  This is used to filter analyses,
 # and for indicating the responsibile lab manager in reports.
 Department = UIDReferenceField(
-    'Department',
+    "Department",
     schemata="Description",
     required=0,
-    allowed_types=('Department',),
+    allowed_types=("Department",),
     widget=ReferenceWidget(
-        label=_("Department"),
-        description=_("The laboratory department"),
-        showOn=True,
-        catalog_name=SETUP_CATALOG,
-        base_query=dict(
-            is_active=True,
-            sort_on="sortable_title",
-            sort_order="ascending",
-        ),
+        label=_(
+            "label_analysis_department",
+            default="Department"),
+        description=_(
+            "description_analysis_department",
+            default="Select the responsible department"),
+        catalog=SETUP_CATALOG,
+        query={
+            "is_active": True,
+            "sort_on": "sortable_title",
+            "sort_order": "ascending"
+        },
+        columns=[
+            {"name": "Title", "label": _("Department Name")},
+            {"name": "getDepartmentID", "label": _("Department ID")},
+        ],
     )
 )
 
@@ -893,19 +900,6 @@ def getTotalDiscountedBulkPrice(self):
         vat = vat and vat or 0
         return float(price) + (float(price) * float(vat)) / 100
 
-    @security.public
-    def getAnalysisCategories(self):
-        """A vocabulary listing available (and activated) categories.
-        """
-        bsc = getToolByName(self, 'senaite_catalog_setup')
-        cats = bsc(portal_type='AnalysisCategory', is_active=True)
-        items = [(o.UID, o.Title) for o in cats]
-        o = self.getCategory()
-        if o and o.UID() not in [i[0] for i in items]:
-            items.append((o.UID(), o.Title()))
-        items.sort(lambda x, y: cmp(x[1], y[1]))
-        return DisplayList(list(items))
-
     @security.public
     def getLowerDetectionLimit(self):
         """Get the lower detection limit

src/bika/lims/content/analysiscategory.py

@@ -20,26 +20,25 @@
 
 import transaction
 from AccessControl import ClassSecurityInfo
-from bika.lims.browser.fields import UIDReferenceField
-from Products.Archetypes.Field import FloatField
-from Products.Archetypes.Field import TextField
-from Products.Archetypes.Schema import Schema
-from Products.Archetypes.Widget import DecimalWidget
-from Products.Archetypes.Widget import TextAreaWidget
-from Products.Archetypes.public import BaseContent
-from Products.Archetypes.public import registerType
-from Products.CMFCore.WorkflowCore import WorkflowException
-from zope.interface import implements
-
 from bika.lims import api
 from bika.lims import bikaMessageFactory as _
-from senaite.core.browser.widgets.referencewidget import ReferenceWidget
+from bika.lims.browser.fields import UIDReferenceField
 from bika.lims.catalog.bikasetup_catalog import SETUP_CATALOG
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
 from bika.lims.interfaces import IAnalysisCategory
 from bika.lims.interfaces import IDeactivable
 from bika.lims.interfaces import IHaveDepartment
+from Products.Archetypes.Field import FloatField
+from Products.Archetypes.Field import TextField
+from Products.Archetypes.public import BaseContent
+from Products.Archetypes.public import registerType
+from Products.Archetypes.Schema import Schema
+from Products.Archetypes.Widget import DecimalWidget
+from Products.Archetypes.Widget import TextAreaWidget
+from Products.CMFCore.WorkflowCore import WorkflowException
+from senaite.core.browser.widgets.referencewidget import ReferenceWidget
+from zope.interface import implements
 
 Comments = TextField(
     "Comments",
@@ -57,15 +56,22 @@
     required=1,
     allowed_types=("Department",),
     widget=ReferenceWidget(
-        label=_("Department"),
-        description=_("The laboratory department"),
-        showOn=True,
-        catalog_name=SETUP_CATALOG,
-        base_query={
+        label=_(
+            "label_category_department",
+            default="Department"),
+        description=_(
+            "description_category_department",
+            default="Select the responsible department"),
+        catalog=SETUP_CATALOG,
+        query={
             "is_active": True,
             "sort_on": "sortable_title",
             "sort_order": "ascending"
         },
+        columns=[
+            {"name": "Title", "label": _("Department Name")},
+            {"name": "getDepartmentID", "label": _("Department ID")},
+        ],
     )
 )