Skip to content

Commit

Permalink
Fix implicit imports for controlpanel mappings (#56)
Browse files Browse the repository at this point in the history
* Fix implicit/moved imports to be explicit

* Changelog updated
  • Loading branch information
ramonski committed Mar 29, 2023
1 parent b2d311d commit a352b3a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
2.5.0 (unreleased)
------------------

- #56 Fix implicit imports for controlpanel mappings
- #54 Lookup mapped catalogs for CatalogBrains


Expand Down
18 changes: 11 additions & 7 deletions src/senaite/jsonapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@
from DateTime import DateTime
from plone import api as ploneapi
from plone.behavior.interfaces import IBehaviorAssignable
from plone.i18n.interfaces import ILanguageSchema
from plone.jsonapi.core import router
from Products.ATContentTypes.utils import DT2dt
from Products.CMFPlone.controlpanel import browser as cp
from Products.CMFPlone.interfaces.controlpanel import IDateAndTimeSchema
from Products.CMFPlone.interfaces.controlpanel import IMailSchema
from Products.CMFPlone.interfaces.controlpanel import IMaintenanceSchema
from Products.CMFPlone.interfaces.controlpanel import ISecuritySchema
from Products.CMFPlone.interfaces.controlpanel import IUserGroupsSettingsSchema
from Products.CMFPlone.PloneBatch import Batch
from Products.ZCatalog.Lazy import LazyMap
from senaite.jsonapi import logger
Expand All @@ -57,12 +62,11 @@
DEFAULT_ENDPOINT = "senaite.jsonapi.v1.get"

CONTROLPANEL_INTERFACE_MAPPING = {
'mail': [cp.mail.IMailSchema],
'language': [cp.language.ILanguageSchema],
'dateandtime': [cp.dateandtime.IDateAndTimeSchema],
'usergroups': [cp.usergroups.IUserGroupsSettingsSchema,
cp.usergroups.ISecuritySchema],
'maintenance': [cp.maintenance.IMaintenanceSchema],
"mail": [IMailSchema],
"language": [ILanguageSchema],
"dateandtime": [IDateAndTimeSchema],
"usergroups": [IUserGroupsSettingsSchema, ISecuritySchema],
"maintenance": [IMaintenanceSchema],
}

SKIP_UPDATE_FIELDS = ["id", ]
Expand Down

0 comments on commit a352b3a

Please sign in to comment.