Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed Identifier Types #1430

Merged
merged 18 commits into from
Oct 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Changelog

**Removed**

- #1430 Removed Identifier Types


**Fixed**

Expand Down
1 change: 0 additions & 1 deletion bika/lims/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions bika/lims/adapters/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,6 @@
END OF FIELDS/WIDGETS VISIBILITY
-->

<adapter name='bika.lims.IHaveIdentifiersExtender' factory=".identifiers.IHaveIdentifiersSchemaExtender"/>
<adapter name='bika.lims.IHaveIdentifiersModifier' factory=".identifiers.IHaveIdentifiersSchemaModifier"/>

<adapter factory=".identifiers.IdentifiersIndexer" name="Identifiers"/>

<browser:page
for="*"
name="getidentifiertypes"
class="bika.lims.adapters.identifiers.ajaxGetIdentifierTypes"
permission="zope.Public"
layer="bika.lims.interfaces.IBikaLIMS"
/>

<!-- Stickers -->
<!-- IGetStickerTemplates adapters -->
<adapter
Expand Down
161 changes: 0 additions & 161 deletions bika/lims/adapters/identifiers.py

This file was deleted.

Binary file removed bika/lims/browser/images/bikalabstellit200x.png
Binary file not shown.
Binary file removed bika/lims/browser/images/identifiertype.png
Binary file not shown.
Binary file removed bika/lims/browser/images/identifiertype_big.png
Binary file not shown.
3 changes: 1 addition & 2 deletions bika/lims/content/analysisservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
34 changes: 0 additions & 34 deletions bika/lims/content/identifiertype.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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,
Expand All @@ -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):
Expand Down
Loading