From e5d62c7c014d655870c8e662cdb34704fdcfc3ba Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 18:30:39 +0200 Subject: [PATCH 01/17] Removed `IHaveIdentifiers` interface implementation for AS --- bika/lims/content/analysisservice.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bika/lims/content/analysisservice.py b/bika/lims/content/analysisservice.py index 7e95b90696..7d90271db9 100644 --- a/bika/lims/content/analysisservice.py +++ b/bika/lims/content/analysisservice.py @@ -32,7 +32,6 @@ from bika.lims.content.abstractbaseanalysis import schema from bika.lims.interfaces import IAnalysisService from bika.lims.interfaces import IDeactivable -from bika.lims.interfaces import IHaveIdentifiers from bika.lims.utils import to_utf8 as _c from magnitude import mg from Products.Archetypes.public import BooleanField @@ -419,7 +418,7 @@ def Containers(self, instance=None): class AnalysisService(AbstractBaseAnalysis): - implements(IAnalysisService, IHaveIdentifiers, IDeactivable) + implements(IAnalysisService, IDeactivable) security = ClassSecurityInfo() schema = schema displayContentsTab = False From 2f5a2a51a3bac335bcd93e1c6edc29d15586a3e3 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 18:35:43 +0200 Subject: [PATCH 02/17] Removed schema extender --- bika/lims/adapters/configure.zcml | 13 --- bika/lims/adapters/identifiers.py | 161 ---------------------------- bika/lims/content/identifiertype.py | 34 ------ 3 files changed, 208 deletions(-) delete mode 100644 bika/lims/adapters/identifiers.py diff --git a/bika/lims/adapters/configure.zcml b/bika/lims/adapters/configure.zcml index 2281f81ea1..e39316b406 100644 --- a/bika/lims/adapters/configure.zcml +++ b/bika/lims/adapters/configure.zcml @@ -146,19 +146,6 @@ END OF FIELDS/WIDGETS VISIBILITY --> - - - - - - - -1] - - for p in brains: - rows.append({'IdentifierType': p.Title, - 'Description': p.Description}) - - rows = sorted(rows, cmp=lambda x, y: cmp(x.lower( - ), y.lower()), key=itemgetter(sidx and sidx or 'IdentifierType')) - if sord == 'desc': - rows.reverse() - pages = len(rows) / int(nr_rows) - pages += divmod(len(rows), int(nr_rows))[1] and 1 or 0 - ret = {'page': page, - 'total': pages, - 'records': len(rows), - 'rows': rows[(int(page) - 1) * int(nr_rows): int(page) * int( - nr_rows)]} - return json.dumps(ret) diff --git a/bika/lims/content/identifiertype.py b/bika/lims/content/identifiertype.py index 5da3b90849..dfa168ef1f 100644 --- a/bika/lims/content/identifiertype.py +++ b/bika/lims/content/identifiertype.py @@ -32,28 +32,6 @@ from Products.CMFCore.utils import getToolByName from zope.interface import implements -from ZODB.POSException import ConflictError - -# class IdentifierTypeAttributesField(RecordsField): -# """Keeps a list of possible attributes for an identifier of this type -# """ -# _properties = RecordsField._properties.copy() -# _properties.update({ -# 'fixedSize': False, -# 'minimalSize': 1, -# 'maximalSize': 9999, -# 'type': 'identifiertypeattributes', -# 'subfields': ('title', 'description'), -# 'required_subfields': ('title',), -# 'subfield_labels': {'title': _('Attribute Title'), -# 'description': _('Description')}, -# 'subfield_sizes': {'title': 20, -# 'description': 35}, -# 'subfield_validators': {'title': 'identifiertypeattributesvalidator'}, -# }) -# security = ClassSecurityInfo() - - PortalTypes = LinesField( 'PortalTypes', vocabulary='getPortalTypes', @@ -63,17 +41,6 @@ ), ) -# Attributes = IdentifierTypeAttributesField( -# 'Attributes', -# widget=BikaRecordsWidget( -# label=_("Identifier attributes"), -# description=_("Each item identified with this IdentifierType can " -# "contain additional information. The allowed -# attributes " -# "can be specified here."), -# ), -# ) - schema = BikaSchema.copy() + Schema(( PortalTypes, # Attributes, @@ -92,7 +59,6 @@ class IdentifierType(BaseContent): def _renameAfterCreation(self, check_auto_id=False): from bika.lims.idserver import renameAfterCreation - renameAfterCreation(self) def getPortalTypes(self): From 81b86328e8a88854ffe9c30d3eade2d79688f60b Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:15:04 +0200 Subject: [PATCH 03/17] Removed listing view --- .../lims/controlpanel/bika_identifiertypes.py | 135 ------------------ bika/lims/controlpanel/configure.zcml | 8 -- 2 files changed, 143 deletions(-) delete mode 100644 bika/lims/controlpanel/bika_identifiertypes.py diff --git a/bika/lims/controlpanel/bika_identifiertypes.py b/bika/lims/controlpanel/bika_identifiertypes.py deleted file mode 100644 index 991f6d583e..0000000000 --- a/bika/lims/controlpanel/bika_identifiertypes.py +++ /dev/null @@ -1,135 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of SENAITE.CORE. -# -# SENAITE.CORE is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation, version 2. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Copyright 2018-2019 by it's authors. -# Some rights reserved, see README and LICENSE. - -import collections - -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 IIdentifierTypes -from bika.lims.permissions import AddIdentifierType -from bika.lims.utils import get_link -from plone.app.folder.folder import ATFolder -from plone.app.folder.folder import ATFolderSchema -from Products.Archetypes.public import registerType -from Products.ATContentTypes.content import schemata -from zope.interface.declarations import implements - - -class IdentifierTypesView(BikaListingView): - """Listing for identifier types - """ - - def __init__(self, context, request): - super(IdentifierTypesView, self).__init__(context, request) - - self.catalog = "bika_setup_catalog" - - self.contentFilter = { - "portal_type": "IdentifierType", - "sort_on": "sortable_title", - "sort_order": "ascending" - } - - self.context_actions = { - _("Add"): { - "url": "createObject?type_name=IdentifierType", - "permission": AddIdentifierType, - "icon": "++resource++bika.lims.images/add.png"}} - - self.title = self.context.translate(_("Identifier Types")) - self.description = "" - self.icon = "{}/{}".format( - self.portal_url, - "++resource++bika.lims.images/identifiertype_big.png") - - self.show_select_column = True - self.pagesize = 25 - - self.columns = collections.OrderedDict(( - ("Title", { - "title": _("Title"), - "index": "sortable_title"}), - ("Description", { - "title": _("Description"), - "index": "description", - "toggle": True}), - )) - - self.review_states = [ - { - "id": "default", - "title": _("Active"), - "contentFilter": {"is_active": True}, - "columns": self.columns.keys(), - }, { - "id": "inactive", - "title": _("Inactive"), - "contentFilter": {"is_active": False}, - "columns": self.columns.keys(), - }, { - "id": "all", - "title": _("All"), - "contentFilter": {}, - "columns": self.columns.keys(), - }, - ] - - def before_render(self): - """Before template render hook - """ - # Don't allow any context actions - self.request.set("disable_border", 1) - - def folderitem(self, obj, item, index): - """Applies new properties to the item (Client) that is currently being - rendered as a row in the list - - :param obj: client to be rendered as a row in the list - :param item: dict representation of the client, suitable for the list - :param index: current position of the item within the list - :type obj: ATContentType/DexterityContentType - :type item: dict - :type index: int - :return: the dict representation of the item - :rtype: dict - """ - - url = obj.absolute_url() - title = obj.Title() - - item["Description"] = obj.Description() - item["replace"]["Title"] = get_link(url, value=title) - - return item - - -schema = ATFolderSchema.copy() - - -class IdentifierTypes(ATFolder): - implements(IIdentifierTypes) - displayContentsTab = False - schema = schema - - -schemata.finalizeATCTSchema(schema, folderish=True, moveDiscussion=False) - -registerType(IdentifierTypes, PROJECTNAME) diff --git a/bika/lims/controlpanel/configure.zcml b/bika/lims/controlpanel/configure.zcml index a58f1e6db7..7f716a03aa 100644 --- a/bika/lims/controlpanel/configure.zcml +++ b/bika/lims/controlpanel/configure.zcml @@ -132,14 +132,6 @@ layer="bika.lims.interfaces.IBikaLIMS" /> - - Date: Sat, 24 Aug 2019 22:15:18 +0200 Subject: [PATCH 04/17] Removed index creation from setuphandlers --- bika/lims/setuphandlers.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bika/lims/setuphandlers.py b/bika/lims/setuphandlers.py index 3f827566f2..3306643c36 100644 --- a/bika/lims/setuphandlers.py +++ b/bika/lims/setuphandlers.py @@ -105,7 +105,6 @@ ("Container", ["bika_setup_catalog"]), ("ContainerType", ["bika_setup_catalog"]), ("Department", ["bika_setup_catalog", "portal_catalog"]), - ("IdentifierType", ["bika_setup_catalog"]), ("Instrument", ["bika_setup_catalog", "portal_catalog"]), ("InstrumentLocation", ["bika_setup_catalog", "portal_catalog"]), ("InstrumentType", ["bika_setup_catalog", "portal_catalog"]), @@ -134,7 +133,6 @@ ("bika_catalog", "BatchDate", "", "DateIndex"), ("bika_catalog", "Creator", "", "FieldIndex"), ("bika_catalog", "Description", "", "ZCTextIndex"), - ("bika_catalog", "Identifiers", "", "KeywordIndex"), ("bika_catalog", "Title", "", "ZCTextIndex"), ("bika_catalog", "Type", "", "FieldIndex"), ("bika_catalog", "UID", "", "FieldIndex"), @@ -165,7 +163,6 @@ ("bika_setup_catalog", "Creator", "", "FieldIndex"), ("bika_setup_catalog", "Description", "", "ZCTextIndex"), - ("bika_setup_catalog", "Identifiers", "", "KeywordIndex"), ("bika_setup_catalog", "Title", "", "ZCTextIndex"), ("bika_setup_catalog", "Type", "", "FieldIndex"), ("bika_setup_catalog", "UID", "", "FieldIndex"), From d97fb3452642b49d3131ea7686bf9df9d7c41574 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:15:43 +0200 Subject: [PATCH 05/17] Added upgrade step --- bika/lims/upgrade/v01_03_002.py | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/bika/lims/upgrade/v01_03_002.py b/bika/lims/upgrade/v01_03_002.py index b38a6ad73d..4fc65ad3b4 100644 --- a/bika/lims/upgrade/v01_03_002.py +++ b/bika/lims/upgrade/v01_03_002.py @@ -56,9 +56,13 @@ def upgrade(tool): # Allow to detach a partition from its primary sample (#1420) update_partitions_role_mappings(portal) + # Remove Identifiers + remove_identifiers(portal) + logger.info("{0} upgraded to version {1}".format(product, version)) return True + def update_partitions_role_mappings(portal): """Updates the rolemappings for existing partitions that are in a suitable state, so they can be detached from the primary sample they belong to @@ -88,3 +92,33 @@ def update_partitions_role_mappings(portal): partition.reindexObjectSecurity() logger.info("Updating role mappings of partitions [DONE]") + + +def remove_identifiers(portal): + """Remove Identifiers from the portal + """ + # 1. Remove the identifiers and identifier types + logger.info("Removing identifiers ...") + + setup = portal.bika_setup + try: + # we use _delOb because manage_delObjects raises an unauthorized here + it = setup["bika_identifiertypes"] + for i in it.objectValues(): + i.unindexObject() + it.unindexObject() + setup._delOb("bika_identifiertypes") + except KeyError: + pass + + # 2. Remove controlpanel configlet + cp = portal.portal_controlpanel + cp.unregisterConfiglet("bika_identifiertypes") + + # 3. Remove catalog indexes + for cat in ["bika_catalog", "bika_setup_catalog"]: + tool = portal[cat] + if "Identifiers" in tool.indexes(): + tool.manage_delIndex("Identifiers") + + logger.info("Removing identifiers [DONE]") From 76a535372af6879b05a930caf7f263da7ea6b732 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:16:49 +0200 Subject: [PATCH 06/17] Removed identifiertypes configlet profile --- bika/lims/profiles/default/controlpanel.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bika/lims/profiles/default/controlpanel.xml b/bika/lims/profiles/default/controlpanel.xml index dfac638c68..6a056bcca3 100644 --- a/bika/lims/profiles/default/controlpanel.xml +++ b/bika/lims/profiles/default/controlpanel.xml @@ -57,15 +57,6 @@ senaite.core: Manage Bika - - senaite.core: Manage Bika - - Date: Sat, 24 Aug 2019 22:17:35 +0200 Subject: [PATCH 07/17] Removed workflow binding --- bika/lims/profiles/default/workflows.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/bika/lims/profiles/default/workflows.xml b/bika/lims/profiles/default/workflows.xml index 0bccdebd78..cf77360929 100644 --- a/bika/lims/profiles/default/workflows.xml +++ b/bika/lims/profiles/default/workflows.xml @@ -203,9 +203,6 @@ - - - From fabea7e80adb79e8253ef49fdcd4db437fc9cbeb Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:19:01 +0200 Subject: [PATCH 08/17] Removed type profile --- bika/lims/profiles/default/types.xml | 2 - .../profiles/default/types/IdentifierType.xml | 46 ------------------- .../default/types/IdentifierTypes.xml | 27 ----------- 3 files changed, 75 deletions(-) delete mode 100644 bika/lims/profiles/default/types/IdentifierType.xml delete mode 100644 bika/lims/profiles/default/types/IdentifierTypes.xml diff --git a/bika/lims/profiles/default/types.xml b/bika/lims/profiles/default/types.xml index 46aa1a67af..6f061295a0 100644 --- a/bika/lims/profiles/default/types.xml +++ b/bika/lims/profiles/default/types.xml @@ -38,8 +38,6 @@ - - diff --git a/bika/lims/profiles/default/types/IdentifierType.xml b/bika/lims/profiles/default/types/IdentifierType.xml deleted file mode 100644 index 9f2246840d..0000000000 --- a/bika/lims/profiles/default/types/IdentifierType.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - Identifier Type - - ++resource++bika.lims.images/identifiertype.png - IdentifierType - bika.lims - addIdentifierType - - - False - False - - False - False - - - - - - - - - - - - - - diff --git a/bika/lims/profiles/default/types/IdentifierTypes.xml b/bika/lims/profiles/default/types/IdentifierTypes.xml deleted file mode 100644 index 127167d2da..0000000000 --- a/bika/lims/profiles/default/types/IdentifierTypes.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - Identifier Types - - ++resource++bika.lims.images/identifiertype.png - IdentifierTypes - bika.lims - addIdentifierTypes - - - False - True - - - - False - False - - - - - - - From bb106ff8b0d865d080426288eb9bfc18f3cecead Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:19:53 +0200 Subject: [PATCH 09/17] Removed rolemapping --- bika/lims/profiles/default/rolemap.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bika/lims/profiles/default/rolemap.xml b/bika/lims/profiles/default/rolemap.xml index 79fa39d41c..f9eaef33e7 100644 --- a/bika/lims/profiles/default/rolemap.xml +++ b/bika/lims/profiles/default/rolemap.xml @@ -232,12 +232,6 @@ - - - - - - From f2ee4d3ca5134b4eb0cda7c4747183f0f8e5b8ae Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:21:00 +0200 Subject: [PATCH 10/17] Removed import --- bika/lims/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bika/lims/__init__.py b/bika/lims/__init__.py index 96c6c6b44a..baff9c2503 100644 --- a/bika/lims/__init__.py +++ b/bika/lims/__init__.py @@ -156,7 +156,6 @@ def initialize(context): from controlpanel.bika_containers import Containers # noqa from controlpanel.bika_containertypes import ContainerTypes # noqa from controlpanel.bika_departments import Departments # noqa - from controlpanel.bika_identifiertypes import IdentifierTypes # noqa from controlpanel.bika_instrumentlocations import InstrumentLocations # noqa from controlpanel.bika_instruments import Instruments # noqa from controlpanel.bika_instrumenttypes import InstrumentTypes # noqa From e7081bf7607f7c7deaa2b390c2f47e8eabc986d3 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:24:32 +0200 Subject: [PATCH 11/17] Changelog updated --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index b5d3da8f88..532c2c1587 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,6 +19,8 @@ Changelog **Removed** +- #1430 Removed Identifiers + **Fixed** From cae91c93fd7ca76950ef9922d6cfbe7c33e4e195 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:27:36 +0200 Subject: [PATCH 12/17] Removed index profile --- bika/lims/profiles/default/catalog.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/bika/lims/profiles/default/catalog.xml b/bika/lims/profiles/default/catalog.xml index d88ab46559..68dd0bfe5d 100644 --- a/bika/lims/profiles/default/catalog.xml +++ b/bika/lims/profiles/default/catalog.xml @@ -14,6 +14,5 @@ - From ee16262090b2e9a738e9f1c678408db8226cdf46 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:28:18 +0200 Subject: [PATCH 13/17] Also consider the portal_catalog --- bika/lims/upgrade/v01_03_002.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bika/lims/upgrade/v01_03_002.py b/bika/lims/upgrade/v01_03_002.py index 4fc65ad3b4..f89cb81db9 100644 --- a/bika/lims/upgrade/v01_03_002.py +++ b/bika/lims/upgrade/v01_03_002.py @@ -116,7 +116,7 @@ def remove_identifiers(portal): cp.unregisterConfiglet("bika_identifiertypes") # 3. Remove catalog indexes - for cat in ["bika_catalog", "bika_setup_catalog"]: + for cat in ["portal_catalog", "bika_catalog", "bika_setup_catalog"]: tool = portal[cat] if "Identifiers" in tool.indexes(): tool.manage_delIndex("Identifiers") From deec4b524c1daec8ef395a75c2ddb88c95b328d6 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sat, 24 Aug 2019 22:32:42 +0200 Subject: [PATCH 14/17] Removed images --- bika/lims/browser/images/bikalabstellit200x.png | Bin 2801 -> 0 bytes bika/lims/browser/images/identifiertype.png | Bin 884 -> 0 bytes bika/lims/browser/images/identifiertype_big.png | Bin 2055 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bika/lims/browser/images/bikalabstellit200x.png delete mode 100644 bika/lims/browser/images/identifiertype.png delete mode 100644 bika/lims/browser/images/identifiertype_big.png diff --git a/bika/lims/browser/images/bikalabstellit200x.png b/bika/lims/browser/images/bikalabstellit200x.png deleted file mode 100644 index e244e0d25900f7df559cf462b9590e57f2787cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2801 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 Wy>4Qd*WtH+RxmWUq|Z1{i2N@JOEDY( diff --git a/bika/lims/browser/images/identifiertype.png b/bika/lims/browser/images/identifiertype.png deleted file mode 100644 index 2612d4665457080533d0ba9eacafa14b46f5600a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmV-)1B?8LP)mK={6dRTU!MoOYzoz zGEinO)1Wp%n28$|u3(Oq6cx2q(70ll?P?4hly@Wh)6H&wRILOB8e03gK-Qc_a>noOoDsZ=^B zm&-p^S66?=FpNtgkqC#wQEIo_%fsPtBAd-#w%KeCW4aTAoSdBBX0!P*hr?M627}a* zk&z0WPS>2BoxLHENZ_unE=5~g+spFu@-HZg-anrOAQFkJ5CmD4mzP;gCUZ3q2&Bqn zvi|Mu?bO`d+@(+`ltib~H&7G>Wir{|g$(-p`=8ltHlbK7wsv%M)Q*pjKL`W@H}>}S zk`odVBFD$aaa1bxU~6kDJuNLQ5Yv%kgVX7ph(@F2?(XjAQ&UrS+uPe;3=a=Ks;Q~@ zq|s>JhQr~6wY4=Cg+e*X%F6nKAjq#X86XHE%FE01KoDegyWO`P4o9h4t$xSj@qP-0 zLOVeaBpk=%xLmHcr>948A%nWQy7q>K2EEVcW4c_fd_JE)*Vx$j8UO%5AP|iC{r+?i z1W}br_1@$0@Gd;k?(XhYlgacHhT$qQnS9jR+Nw!PN;-%{BJrD>n^{dwO>a6oJ8Ksf z7TAY}hlwhc>cbfWuh+{#5JU(;&jaq+lLr_)EHQ2>VF zCm9(TfeUAhj*bfXeEwWvVIgWZn=9w%=Q%4YD=e*6+stG#S6fe$vig8z15P8M`0000< KMNUMnLSTYYzMoqF diff --git a/bika/lims/browser/images/identifiertype_big.png b/bika/lims/browser/images/identifiertype_big.png deleted file mode 100644 index 0f6791c029b0cd40398b859f890a3a942060b37a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2055 zcmV+i2>ADjP)Kx#bU7x0BA0ktMl>kc^Mxc zf2F*HTU+ZH42Cf_HugqsZLL_R)7b%l!C+vuwY9C;zkmN9WX83&8cv9c2?iMefuW>=Pg!a^=dW76V90 zNy!I5XJut&0zghqP6hya$&w}gg@uJl3WXvjB_$=F%jIe*iZb52cTWNUrrXk|PM!J< z0K{T(ErY=@T0}!>X=#F~=HE50)XV?y&m>9)} z4QCIg$y0Zfa@@niIh2 z=qTS5LTEG^{;plSE)w1c1_qn~;Le>p;Q;8Mpr9rI7#kboak*TrNd=+T>)8}V8O368 zEdcDhc1B z!-o&&0-y^E3zJAr0HF8n+xG_m1O^5^X0cd?uV24f&FNe!l`4t435CMJl9G~rGcz+* z0MOFX;_u|-G{|5ujMuJR`x*FF`)oE_@9OHRnwpwo1AyrteeT>j82~I?xNyYB$LHm| zZZ8&#Yb6p%&E?CNcaj4Q1_LWEFE5S7Vi~NgtY$7-;^Oj& z$Kz?|)e|NsCvB^%t0QGHncUIQaR>m-X0!Fl$;ky|*cccXa9+K7bsGRWE-tQ|bV_1` z0#o**va&LY&1UQE?Cf-N0+7jMa+oC6)zwv%nVFeQs)8Iw29Ujb_nszYnUs`Nl$x5F zPolGE(IPdA#WGyHcySj1eEj&)<>}L>E9L~y*4DP>*s){(?da%OWqz~H&Q9O(@bJ4Z zwc*mz(ggE;!NI|e0O;%2uWti@*4EZFB!a%azR!z`iw{gpOxRkK1Jl#ftXsEkMM)%* z8U}-51VBebMBIJ*_U+Q|*Y@`Iy7T#b4U@?nm{yc{<*H3eozUxN-uht*vbh(T>fVH{a^%>G1@FMctHa0es1f0FSy+)x>#1O6}5=jkA z18ihuq*9?!#1Ji+muaAwG2I(C<7RPYZx{b8~wym&+51i;E9%xm+y(IyyR9 z@$TI_HvqVQ|Gt>y1pu1RVv)Un|K6>rs3>Xe+O^H(AdyIgq_bSX@g{lyULm#j1Yg%YWXmVZ%e>G$0_L z`RdiHaXC3T84eB(BQVW|1qB7k8jXeze5;hczCQPV4Zz>u|4*2*IwB%M`Tb<0(P;RY znVH#qK3@ZX=5RPV(g}ZvUAS;z*U_U#Q_U;m!Gi}IcJADHB{4Da Date: Sun, 25 Aug 2019 08:02:39 +0200 Subject: [PATCH 15/17] Removed structure profile --- bika/lims/profiles/default/structure/bika_setup/.objects | 1 - bika/lims/profiles/default/structure/bika_setup/.preserve | 1 - .../structure/bika_setup/bika_identifiertypes/.objects | 0 .../structure/bika_setup/bika_identifiertypes/.properties | 4 ---- 4 files changed, 6 deletions(-) delete mode 100644 bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.objects delete mode 100644 bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.properties diff --git a/bika/lims/profiles/default/structure/bika_setup/.objects b/bika/lims/profiles/default/structure/bika_setup/.objects index 6807ec1c4f..06bc8e3f7a 100644 --- a/bika/lims/profiles/default/structure/bika_setup/.objects +++ b/bika/lims/profiles/default/structure/bika_setup/.objects @@ -7,7 +7,6 @@ bika_analysisspecs,AnalysisSpecs bika_attachmenttypes,AttachmentTypes bika_batchlabels,BatchLabels bika_calculations,Calculations -bika_identifiertypes,IdentifierTypes bika_instruments,Instruments bika_instrumenttypes,InstrumentTypes bika_instrumentlocations,InstrumentLocations diff --git a/bika/lims/profiles/default/structure/bika_setup/.preserve b/bika/lims/profiles/default/structure/bika_setup/.preserve index de3fc0cf47..e2ec2f2431 100644 --- a/bika/lims/profiles/default/structure/bika_setup/.preserve +++ b/bika/lims/profiles/default/structure/bika_setup/.preserve @@ -7,7 +7,6 @@ bika_analysisspecs bika_attachmenttypes bika_batchlabels bika_calculations -bika_identifiertypes bika_instruments bika_instrumenttypes bika_instrumentlocations diff --git a/bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.objects b/bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.objects deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.properties b/bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.properties deleted file mode 100644 index e642ce5478..0000000000 --- a/bika/lims/profiles/default/structure/bika_setup/bika_identifiertypes/.properties +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -description = -title = Identifier Types - From 76f06984f30fac76f9498c4b4bc402e7c63a71d4 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sun, 25 Aug 2019 08:54:52 +0200 Subject: [PATCH 16/17] Cleanup portal_types registry --- bika/lims/upgrade/v01_03_002.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bika/lims/upgrade/v01_03_002.py b/bika/lims/upgrade/v01_03_002.py index f89cb81db9..c5be5a3633 100644 --- a/bika/lims/upgrade/v01_03_002.py +++ b/bika/lims/upgrade/v01_03_002.py @@ -121,4 +121,10 @@ def remove_identifiers(portal): if "Identifiers" in tool.indexes(): tool.manage_delIndex("Identifiers") + # 4. Remove type registration + pt = portal.portal_types + for t in ["IdentifierType", "IdentifierTypes"]: + if t in pt.objectIds(): + pt.manage_delObjects(t) + logger.info("Removing identifiers [DONE]") From 53becb3b1a0d2c2fd4dd041d556458f990bb6981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Mon, 7 Oct 2019 22:09:42 +0200 Subject: [PATCH 17/17] Removed Identifiers --> Removed Identifier Types --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c3d5cecb84..462bd2746c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,7 +28,7 @@ Changelog **Removed** -- #1430 Removed Identifiers +- #1430 Removed Identifier Types **Fixed**