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

Support Dexterity Behavior Fields in API #1490

Merged
merged 5 commits into from
Dec 13, 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
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Changelog

**Changed**

- #1490 Support Dexterity Behavior Fields in API
- #1488 Support Dexterity Contents in Catalog Indexers
- #1486 Clean-up of indexes and metadata from `setup_catalog`

Expand Down
23 changes: 16 additions & 7 deletions bika/lims/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# Some rights reserved, see README and LICENSE.

import re
from collections import OrderedDict
from datetime import datetime
from datetime import timedelta

Expand All @@ -34,6 +35,7 @@
from plone import api as ploneapi
from plone.api.exc import InvalidParameterError
from plone.app.layout.viewlets.content import ContentHistoryView
from plone.behavior.interfaces import IBehaviorAssignable
from plone.dexterity.interfaces import IDexterityContent
from plone.i18n.normalizer.interfaces import IFileNameNormalizer
from plone.i18n.normalizer.interfaces import IIDNormalizer
Expand All @@ -57,6 +59,7 @@
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

"""SENAITE LIMS Framework API
Expand Down Expand Up @@ -333,20 +336,26 @@ def get_schema(brain_or_object):


def get_fields(brain_or_object):
"""Get the list of fields from the object
"""Get a name to field mapping of the object

:param brain_or_object: A single catalog brain or content object
:type brain_or_object: ATContentType/DexterityContentType/CatalogBrain
:returns: List of fields
:rtype: list
:returns: Mapping of name -> field
:rtype: OrderedDict
"""
obj = get_object(brain_or_object)
schema = get_schema(obj)
if is_dexterity_content(obj):
names = schema.names()
fields = map(lambda name: schema.get(name), names)
return dict(zip(names, fields))
return dict(zip(schema.keys(), schema.fields()))
# get the fields directly provided by the interface
fields = getFieldsInOrder(schema)
# append the fields coming from behaviors
behavior_assignable = IBehaviorAssignable(obj)
if behavior_assignable:
behaviors = behavior_assignable.enumerateBehaviors()
for behavior in behaviors:
fields.extend(getFieldsInOrder(behavior.interface))
return OrderedDict(fields)
return OrderedDict(schema)


def get_id(brain_or_object):
Expand Down