Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
wendelin
Commits
2a714f83
Commit
2a714f83
authored
Jan 06, 2016
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Data Supply is a Delivery as it "delivers" a service between two parties.
parent
804dc534
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
bt5/erp5_wendelin/PortalTypeTemplateItem/portal_types/Data%20Supply.xml
...lin/PortalTypeTemplateItem/portal_types/Data%20Supply.xml
+1
-1
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
.../erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
+3
-5
No files found.
bt5/erp5_wendelin/PortalTypeTemplateItem/portal_types/Data%20Supply.xml
View file @
2a714f83
...
@@ -50,7 +50,7 @@ It is used by Ingestion Policy.</string> </value>
...
@@ -50,7 +50,7 @@ It is used by Ingestion Policy.</string> </value>
</item>
</item>
<item>
<item>
<key>
<string>
type_class
</string>
</key>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
Suppl
y
</string>
</value>
<value>
<string>
Deliver
y
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
type_interface
</string>
</key>
<key>
<string>
type_interface
</string>
</key>
...
...
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
View file @
2a714f83
...
@@ -80,10 +80,8 @@ if data_chunk is not None and reference is not None:\n
...
@@ -80,10 +80,8 @@ if data_chunk is not None and reference is not None:\n
query=ComplexQuery(Query(portal_type = \'Data Supply\'),\n
query=ComplexQuery(Query(portal_type = \'Data Supply\'),\n
Query(reference = reference),\n
Query(reference = reference),\n
Query(validation_state = \'validated\'),\n
Query(validation_state = \'validated\'),\n
# XXX: enable when final decision made if Data Supply is a\n
Query( **{\'delivery.stop_date\':now, \'range\': \'min\'}),\n
# Delivery or Supply\n
Query( **{\'delivery.start_date\':now, \'range\': \'max\'}),\n
#Query( **{\'delivery.stop_date\':now, \'range\': \'max\'}),\n
#Query( **{\'delivery.start_date\':now, \'range\': \'min\'}),\n
operator="AND")\n
operator="AND")\n
data_supply = portal_catalog.getResultValue(query=query)\n
data_supply = portal_catalog.getResultValue(query=query)\n
\n
\n
...
@@ -127,7 +125,7 @@ if data_chunk is not None and reference is not None:\n
...
@@ -127,7 +125,7 @@ if data_chunk is not None and reference is not None:\n
else:\n
else:\n
raise NotFound(\'No data supply configuration found.\')\n
raise NotFound(\'No data supply configuration found.\')\n
else:\n
else:\n
raise NotFound(\'No data or any configuration
not
found.\')\n
raise NotFound(\'No data or any configuration found.\')\n
]]>
</string>
</value>
]]>
</string>
</value>
...
...
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