Migrated instrument locations to Dexterity

CHANGES.rst

@@ -4,6 +4,7 @@ Changelog
 2.0.0rc3 (unreleased)
 ---------------------
 
+- #1705 Migrated instrument locations to Dexterity
 - #1706 Add "User name" and "User groups" columns in Lab Contacts listing
 - #1702 Remove Analysis Specifications from AR Add Form
 - #1700 Better styling of header and description in content views

src/bika/lims/api/__init__.py

@@ -23,9 +23,9 @@
 from datetime import datetime
 from datetime import timedelta
 
-import Missing
 import six
 
+import Missing
 from AccessControl.PermissionRole import rolesForPermissionOn
 from Acquisition import aq_base
 from bika.lims import logger
@@ -60,7 +60,6 @@
 from zope.component.interfaces import IFactory
 from zope.event import notify
 from zope.lifecycleevent import ObjectCreatedEvent
-from zope.lifecycleevent import modified
 from zope.schema import getFieldsInOrder
 from zope.security.interfaces import Unauthorized
 
@@ -132,41 +131,35 @@ def create(container, portal_type, *args, **kwargs):
     :returns: The new created object
     """
     from bika.lims.utils import tmpID
-    if kwargs.get("title") is None:
-        kwargs["title"] = "New {}".format(portal_type)
 
-    # generate a temporary ID
-    tmp_id = tmpID()
+    id = kwargs.pop("id", tmpID())
+    title = kwargs.pop("title", "New {}".format(portal_type))
 
     # get the fti
     types_tool = get_tool("portal_types")
     fti = types_tool.getTypeInfo(portal_type)
 
     if fti.product:
-        obj = _createObjectByType(portal_type, container, tmp_id)
+        obj = _createObjectByType(portal_type, container, id)
+        obj.processForm()
+        obj.edit(title=title, **kwargs)
     else:
         # newstyle factory
         factory = getUtility(IFactory, fti.factory)
-        obj = factory(tmp_id, *args, **kwargs)
+        obj = factory(id, *args, **kwargs)
         if hasattr(obj, '_setPortalTypeName'):
             obj._setPortalTypeName(fti.getId())
+        # set the title
+        obj.title = safe_unicode(title)
+        # notify that the object was created
         notify(ObjectCreatedEvent(obj))
         # notifies ObjectWillBeAddedEvent, ObjectAddedEvent and
         # ContainerModifiedEvent
-        container._setObject(tmp_id, obj)
+        container._setObject(id, obj)
         # we get the object here with the current object id, as it might be
         # renamed already by an event handler
         obj = container._getOb(obj.getId())
 
-    # handle AT Content
-    if is_at_content(obj):
-        obj.processForm()
-
-    # Edit after processForm; processForm does AT unmarkCreationFlag.
-    obj.edit(**kwargs)
-
-    # explicit notification
-    modified(obj)
     return obj
 
 

src/bika/lims/controlpanel/bika_instrumentlocations.py

@@ -18,85 +18,15 @@
 # Copyright 2018-2020 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-from Products.ATContentTypes.content import schemata
 from Products.Archetypes import atapi
-from bika.lims import api
-from bika.lims import bikaMessageFactory as _
-from bika.lims.browser.bika_listing import BikaListingView
 from bika.lims.config import PROJECTNAME
-from bika.lims.interfaces import IInstrumentLocations
-from bika.lims.permissions import AddInstrumentLocation
-from bika.lims.utils import get_link
 from plone.app.folder.folder import ATFolder
-from plone.app.folder.folder import ATFolderSchema
-from senaite.core.interfaces import IHideActionsMenu
-from zope.interface import implements
-
-
-
-class InstrumentLocationsView(BikaListingView):
-    """Displays all available instrument locations in a table
-    """
-
-    def __init__(self, context, request):
-        super(InstrumentLocationsView, self).__init__(context, request)
-
-        self.contentFilter = {'portal_type': 'InstrumentLocation',
-                              'sort_on': 'sortable_title'}
-
-        self.context_actions = {_('Add'):
-                                {'url': 'createObject?type_name=InstrumentLocation',
-                                 'permission': AddInstrumentLocation,
-                                 'icon': '++resource++bika.lims.images/add.png'}}
-
-        self.title = self.context.translate(_("Instrument Locations"))
-        self.icon = "++resource++bika.lims.images/instrumenttype_big.png"
-        self.description = ""
-
-        self.show_select_row = False
-        self.show_select_column = True
-        self.pagesize = 25
-
-        self.columns = {
-            'Title': {'title': _('Title'),
-                      'index': 'sortable_title'},
-            'Description': {'title': _('Description'),
-                            'index': 'description',
-                            'toggle': True},
-        }
-
-        self.review_states = [
-            {'id': 'default',
-             'title': _('Active'),
-             'contentFilter': {'is_active': True},
-             'transitions': [{'id': 'deactivate'}, ],
-             'columns': ['Title', 'Description']},
-            {'id': 'inactive',
-             'title': _('Inactive'),
-             'contentFilter': {'is_active': False},
-             'transitions': [{'id': 'activate'}, ],
-             'columns': ['Title', 'Description']},
-            {'id': 'all',
-             'title': _('All'),
-             'contentFilter': {},
-             'columns': ['Title', 'Description']},
-        ]
-
-    def folderitem(self, obj, item, index):
-        obj = api.get_object(obj)
-        item["Description"] = obj.Description()
-        item["replace"]["title"] = get_link(item["url"], item["Title"])
-        return item
-
-
-schema = ATFolderSchema.copy()
 
 
+# BBB: Only kept for backwards compatibility
 class InstrumentLocations(ATFolder):
-    implements(IInstrumentLocations, IHideActionsMenu)
-    displayContentsTab = False
-    schema = schema
+    """Moved to senaite.core.content.instrumentlocations
+    """
 
 
-schemata.finalizeATCTSchema(schema, folderish=True, moveDiscussion=False)
 atapi.registerType(InstrumentLocations, PROJECTNAME)

src/bika/lims/controlpanel/configure.zcml

@@ -148,14 +148,6 @@
       layer="bika.lims.interfaces.IBikaLIMS"
     />
 
-    <browser:page
-      for="bika.lims.interfaces.IInstrumentLocations"
-      name="folder_view"
-      class=".bika_instrumentlocations.InstrumentLocationsView"
-      permission="senaite.core.permissions.ManageBika"
-      layer="bika.lims.interfaces.IBikaLIMS"
-    />
-
     <browser:page
       for="bika.lims.interfaces.ICalculations"
       name="folder_view"

src/bika/lims/profiles/default/factorytool.xml

@@ -27,8 +27,6 @@
   <type portal_type="InstrumentMaintenanceTask"/>
   <type portal_type="InstrumentScheduledTask"/>
   <type portal_type="InstrumentType"/>
-  <type portal_type="InstrumentLocation"/>
-  <type portal_type="InstrumentLocations"/>
   <type portal_type="InstrumentValidation"/>
   <type portal_type="LabContact"/>
   <type portal_type="LabProduct"/>

src/bika/lims/profiles/default/structure/bika_setup/.objects

@@ -1,20 +1,18 @@
 auditlog,AuditLog
 bika_analysiscategories,AnalysisCategories
 bika_analysisprofiles,AnalysisProfiles
-bika_artemplates,ARTemplates
 bika_analysisservices,AnalysisServices
 bika_analysisspecs,AnalysisSpecs
+bika_artemplates,ARTemplates
 bika_attachmenttypes,AttachmentTypes
 bika_batchlabels,BatchLabels
 bika_calculations,Calculations
-bika_instruments,Instruments
-bika_instrumenttypes,InstrumentTypes
-bika_instrumentlocations,InstrumentLocations
-bika_labcontacts,LabContacts
 bika_containers,Containers
 bika_containertypes,ContainerTypes
 bika_departments,Departments
-laboratory,Laboratory
+bika_instruments,Instruments
+bika_instrumenttypes,InstrumentTypes
+bika_labcontacts,LabContacts
 bika_labproducts,LabProducts
 bika_manufacturers,Manufacturers
 bika_preservations,Preservations
@@ -24,8 +22,10 @@ bika_sampleconditions,SampleConditions
 bika_samplematrices,SampleMatrices
 bika_samplepoints,SamplePoints
 bika_sampletypes,SampleTypes
-bika_storagelocations,StorageLocations
 bika_samplingdeviations,SamplingDeviations
+bika_storagelocations,StorageLocations
 bika_subgroups,SubGroups
 bika_suppliers,Suppliers
 bika_worksheettemplates,WorksheetTemplates
+instrumentlocations,InstrumentLocations
+laboratory,Laboratory

src/bika/lims/profiles/default/structure/bika_setup/.preserve

@@ -1,20 +1,18 @@
 auditlog
 bika_analysiscategories
 bika_analysisprofiles
-bika_artemplates
 bika_analysisservices
 bika_analysisspecs
+bika_artemplates
 bika_attachmenttypes
 bika_batchlabels
 bika_calculations
-bika_instruments
-bika_instrumenttypes
-bika_instrumentlocations
-bika_labcontacts
 bika_containers
 bika_containertypes
 bika_departments
-laboratory
+bika_instruments
+bika_instrumenttypes
+bika_labcontacts
 bika_labproducts
 bika_manufacturers
 bika_preservations
@@ -26,6 +24,8 @@ bika_samplepoints
 bika_sampletypes
 bika_samplingdeviations
 bika_storagelocations
-bika_suppliers
 bika_subgroups
+bika_suppliers
 bika_worksheettemplates
+instrumentlocations
+laboratory

src/bika/lims/profiles/default/types.xml

@@ -44,8 +44,6 @@
  <object name="InstrumentScheduledTask" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="InstrumentType" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="InstrumentTypes" meta_type="Factory-based Type Information with dynamic views"/>
- <object name="InstrumentLocation" meta_type="Factory-based Type Information with dynamic views"/>
- <object name="InstrumentLocations" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="InstrumentValidation" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="Invoice" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="LabContact" meta_type="Factory-based Type Information with dynamic views"/>

src/bika/lims/profiles/default/workflows.xml

@@ -204,9 +204,6 @@
     <type type_id="Departments">
       <bound-workflow workflow_id="senaite_one_state_workflow"/>
     </type>
-    <type type_id="InstrumentLocations">
-      <bound-workflow workflow_id="senaite_one_state_workflow"/>
-    </type>
     <type type_id="InstrumentTypes">
       <bound-workflow workflow_id="senaite_one_state_workflow"/>
     </type>
@@ -331,9 +328,6 @@
     <type type_id="Instrument">
       <bound-workflow workflow_id="senaite_deactivable_type_workflow"/>
     </type>
-    <type type_id="InstrumentLocation">
-      <bound-workflow workflow_id="senaite_deactivable_type_workflow"/>
-    </type>
     <type type_id="InstrumentType">
       <bound-workflow workflow_id="senaite_deactivable_type_workflow"/>
     </type>