Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eugene Shen
erp5
Commits
018db171
Commit
018db171
authored
Mar 16, 2017
by
Klaus Wölfel
Committed by
Tatuya Kamada
Apr 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add data_sink type group
parent
24a5d995
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
product/ERP5/ERP5Defaults.py
product/ERP5/ERP5Defaults.py
+3
-0
product/ERP5/ERP5Site.py
product/ERP5/ERP5Site.py
+9
-0
product/ERP5Type/ERP5Type.py
product/ERP5Type/ERP5Type.py
+1
-0
No files found.
product/ERP5/ERP5Defaults.py
View file @
018db171
...
@@ -197,6 +197,9 @@ portal_business_link_type_list = ('Business Link',)
...
@@ -197,6 +197,9 @@ portal_business_link_type_list = ('Business Link',)
portal_data_descriptor_type_list
=
()
portal_data_descriptor_type_list
=
()
portal_data_sink_type_list
=
(
'Data Stream'
,
'Data Bucket Stream'
)
portal_device_type_list
=
(
'Data Acquisition Unit'
,
portal_device_type_list
=
(
'Data Acquisition Unit'
,
'Data Aggregation Unit'
'Data Aggregation Unit'
'Sensor'
)
'Sensor'
)
...
...
product/ERP5/ERP5Site.py
View file @
018db171
...
@@ -1553,6 +1553,15 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
...
@@ -1553,6 +1553,15 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
return
self
.
_getPortalGroupedTypeList
(
'data_descriptor'
)
or
\
return
self
.
_getPortalGroupedTypeList
(
'data_descriptor'
)
or
\
self
.
_getPortalConfiguration
(
'portal_data_descriptor_type_list'
)
self
.
_getPortalConfiguration
(
'portal_data_descriptor_type_list'
)
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'getPortalDataSinkTypeList'
)
def
getPortalDataSinkTypeList
(
self
):
"""
Returns Data Sink types.
"""
return
self
.
_getPortalGroupedTypeList
(
'data_sink'
)
or
\
self
.
_getPortalConfiguration
(
'portal_data_sink_type_list'
)
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'getPortalDeviceTypeList'
)
'getPortalDeviceTypeList'
)
def
getPortalDeviceTypeList
(
self
):
def
getPortalDeviceTypeList
(
self
):
...
...
product/ERP5Type/ERP5Type.py
View file @
018db171
...
@@ -310,6 +310,7 @@ class ERP5TypeInformation(XMLObject,
...
@@ -310,6 +310,7 @@ class ERP5TypeInformation(XMLObject,
'device'
,
'device'
,
'device_configuration'
,
'device_configuration'
,
'data_descriptor'
,
'data_descriptor'
,
'data_sink'
,
# LEGACY - needs a warning - XXX-JPS
# LEGACY - needs a warning - XXX-JPS
'tax_movement'
,
'tax_movement'
,
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment