Skip to content

E
erp5_workflow
Commit 7afc8ae9 authored by wenjie.zheng's avatar wenjie.zheng
Browse files
Options

erp5_web: resolve confilct in /erp5_web/ToolTemplateItem/caching_policy_manager.xml

parent 426965f7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 181 deletions
bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml
View file @ 7afc8ae9
...@@ -370,11 +370,7 @@ ...@@ -370,11 +370,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -427,11 +423,7 @@ ...@@ -427,11 +423,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -445,11 +437,7 @@ ...@@ -445,11 +437,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -487,11 +475,7 @@ ...@@ -487,11 +475,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -649,11 +633,7 @@ ...@@ -649,11 +633,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -667,11 +647,7 @@ ...@@ -667,11 +647,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -709,11 +685,7 @@ ...@@ -709,11 +685,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -766,11 +738,7 @@ ...@@ -766,11 +738,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -784,11 +752,7 @@ ...@@ -784,11 +752,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -826,11 +790,7 @@ ...@@ -826,11 +790,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -883,11 +843,7 @@ ...@@ -883,11 +843,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABs=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -901,11 +857,7 @@ ...@@ -901,11 +857,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAABw=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -943,11 +895,7 @@ ...@@ -943,11 +895,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAAB0=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -1000,11 +948,7 @@ ...@@ -1000,11 +948,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAAB4=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -1018,11 +962,7 @@ ...@@ -1018,11 +962,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAAB8=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -1060,11 +1000,7 @@ ...@@ -1060,11 +1000,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<<<<<<< HEAD
<persistent> <string encoding="base64">AAAAAAAAACA=</string> </persistent>
=======
<persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</value> </value>
</item> </item>
<item> <item>
...@@ -1207,11 +1143,7 @@ ...@@ -1207,11 +1143,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
=======
<value> <string>object/modified</string> </value> <value> <string>object/modified</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1224,11 +1156,7 @@ ...@@ -1224,11 +1156,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: (lambda x: x is not None and x.getCachingPolicy() == \'must-revalidate\')(object.getWebSectionValue())</string> </value>
=======
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'no-cache\')(object.getWebSectionValue())</string> </value> <value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'no-cache\')(object.getWebSectionValue())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1254,11 +1182,7 @@ ...@@ -1254,11 +1182,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>object/modified</string> </value>
=======
<value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime())</string> </value> <value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1271,11 +1195,7 @@ ...@@ -1271,11 +1195,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'no-cache\')(object.getWebSectionValue())</string> </value>
=======
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-day-max-modification-date\')(object.getWebSectionValue())</string> </value> <value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-day-max-modification-date\')(object.getWebSectionValue())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1314,11 +1234,7 @@ ...@@ -1314,11 +1234,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-day-max-modification-date\')(object.getWebSectionValue())</string> </value>
=======
<value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value> <value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1344,11 +1260,7 @@ ...@@ -1344,11 +1260,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime() + (DateTime().hour() /24.0))</string> </value>
=======
<value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value> <value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1361,11 +1273,7 @@ ...@@ -1361,11 +1273,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-hour-max-modification-date\')(object.getWebSectionValue())</string> </value>
=======
<value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value> <value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1404,11 +1312,7 @@ ...@@ -1404,11 +1312,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
=======
<value> <string>python: member is None and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value> <value> <string>python: member is None and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
>>>>>>> eea7178... erp5_web: add hateoas caching policy
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1427,88 +1331,6 @@ ...@@ -1427,88 +1331,6 @@
</pickle> </pickle>
</record> </record>
<record id="25" aka="AAAAAAAAABk="> <record id="25" aka="AAAAAAAAABk=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<<<<<<< HEAD
<value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="26" aka="AAAAAAAAABo=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: object.Base_isPublicConvertionResult() and (lambda x: x is not None and (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="27" aka="AAAAAAAAABs=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="28" aka="AAAAAAAAABw=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
=======
>>>>>>> eea7178... erp5_web: add hateoas caching policy
<value> <string>python: getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<<<<<<< HEAD
<record id="29" aka="AAAAAAAAAB0=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: member is None and (lambda x: x is not None and not (len(x.getAvailableLanguageSet()) == 1 or x.getStaticLanguageSelection()))(object.getWebSectionValue())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="30" aka="AAAAAAAAAB4=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="31" aka="AAAAAAAAAB8=">
<pickle> <pickle>
<global name="Expression" module="Products.CMFCore.Expression"/> <global name="Expression" module="Products.CMFCore.Expression"/>
</pickle> </pickle>
...@@ -1521,10 +1343,7 @@ ...@@ -1521,10 +1343,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="32" aka="AAAAAAAAACA=">
=======
<record id="26" aka="AAAAAAAAABo="> <record id="26" aka="AAAAAAAAABo=">
>>>>>>> eea7178... erp5_web: add hateoas caching policy
<pickle> <pickle>
<global name="Expression" module="Products.CMFCore.Expression"/> <global name="Expression" module="Products.CMFCore.Expression"/>
</pickle> </pickle>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7