diff --git a/CHANGES.rst b/CHANGES.rst index c886ca57ea..c1d453042b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changelog 2.4.0 (unreleased) ------------------ +- #2211 Remove `Profile` field (stale) from AnalysisRequest - #2207 Support for file upload on analysis (pre) conditions - #2208 Remove `default_method` from AnalysisRequest's Contact field - #2204 Fix traceback when retracting an analysis with a detection limit diff --git a/src/bika/lims/content/analysisrequest.py b/src/bika/lims/content/analysisrequest.py index 19ef051e6d..a354fcc34b 100644 --- a/src/bika/lims/content/analysisrequest.py +++ b/src/bika/lims/content/analysisrequest.py @@ -396,29 +396,6 @@ ), ), - # TODO Remove Profile field (in singular) - ReferenceField( - 'Profile', - allowed_types=('AnalysisProfile',), - referenceClass=HoldingReference, - relationship='AnalysisRequestAnalysisProfile', - mode="rw", - read_permission=View, - write_permission=ModifyPortalContent, - widget=ReferenceWidget( - label=_("Analysis Profile"), - description=_("Analysis profiles apply a certain set of analyses"), - size=20, - render_own_label=True, - visible=False, - catalog_name='senaite_catalog_setup', - base_query={"is_active": True, - "sort_on": "sortable_title", - "sort_order": "ascending"}, - showOn=False, - ), - ), - ReferenceField( 'Profiles', multiValued=1, diff --git a/src/senaite/core/exportimport/setupdata/__init__.py b/src/senaite/core/exportimport/setupdata/__init__.py index e4de8ec672..d3c4950528 100644 --- a/src/senaite/core/exportimport/setupdata/__init__.py +++ b/src/senaite/core/exportimport/setupdata/__init__.py @@ -2280,13 +2280,13 @@ def Import(self): getFullname=row['CCContact_Fullname'])[0].getObject() obj.setCCContact(contact) if row['AnalysisProfile_title']: - profile = pc(portal_type="AnalysisProfile", - title=row['AnalysisProfile_title'].getObject()) - obj.setProfile(profile) + profiles = pc(portal_type="AnalysisProfile", + title=row['AnalysisProfile_title'])[0].getObject() + obj.setProfiles([profiles]) if row['ARTemplate_title']: template = pc(portal_type="ARTemplate", title=row['ARTemplate_title'])[0].getObject() - obj.setProfile(template) + obj.setTemplate(template) obj.unmarkCreationFlag()