Skip to content

erp5
erp5
Commit eb616c1e authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Fixup No-cache and No-Store on caching policy 

See merge request !1831
parents c7943a9a bf447559
Hide whitespace changes
Inline Side-by-side
Showing with 664 additions and 42 deletions
bt5/erp5_web/PathTemplateItem/portal_categories/caching_policy/no-store.xml 0 → 100644
View file @ eb616c1e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>caching_policy/no-cache</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>no-store</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>No Store</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/TestTemplateItem/portal_components/test.erp5.testERP5Web.py
View file @ eb616c1e
...@@ -252,8 +252,6 @@ class TestERP5Web(ERP5TypeTestCase): ...@@ -252,8 +252,6 @@ class TestERP5Web(ERP5TypeTestCase):
except Exception: except Exception:
self.fail('Cataloging of the Web Site failed.') self.fail('Cataloging of the Web Site failed.')
def test_02_EditSimpleWebPage(self): def test_02_EditSimpleWebPage(self):
""" """
Simple Case of creating a web page. Simple Case of creating a web page.
...@@ -1257,9 +1255,8 @@ Hé Hé Hé!""", page.asText().strip()) ...@@ -1257,9 +1255,8 @@ Hé Hé Hé!""", page.asText().strip())
def test_15_Check_LastModified_Header(self): def test_15_Check_LastModified_Header(self):
"""Checks that Last-Modified header set by caching policy manager """Checks that Last-Modified header set by caching policy manager
is correctly filled with getModificationDate of content. is correctly filled with getModificationDate of content.
This test check 2 Policy installed by erp5_web: This test check 1 Policy installed by erp5_web:
Policy ID - unauthenticated web pages Policy ID - unauthenticated web pages
authenticated
""" """
website = self.setupWebSite() website = self.setupWebSite()
web_section_portal_type = 'Web Section' web_section_portal_type = 'Web Section'
...@@ -1285,15 +1282,52 @@ Hé Hé Hé!""", page.asText().strip()) ...@@ -1285,15 +1282,52 @@ Hé Hé Hé!""", page.asText().strip())
modification_date = rfc1123_date(document.getModificationDate()) modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header) self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=600, stale-while-revalidate=360000, public')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
'Cookie, Authorization')
def test_15a_Check_LastModified_Header_authenticated(self):
"""Checks that Last-Modified header is NOT set by caching policy manager
This test check 1 Policy installed by erp5_web:
Policy ID - authenticated
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# authenticated # authenticated
user = self.createUser('webmaster') user = self.createUser('webmaster')
self.createUserAssignement(user, {}) self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster') response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified') last_modified_header = response.getHeader('Last-Modified')
self.assertTrue(last_modified_header) self.assertFalse(last_modified_header)
# Convert the Date into string according RFC 1123 Time Format
modification_date = rfc1123_date(document.getModificationDate()) # Check cache control
self.assertEqual(modification_date, last_modified_header) cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_15a_CheckCachingPolicyManager(self): def test_15a_CheckCachingPolicyManager(self):
""" """
...@@ -1646,6 +1680,364 @@ Hé Hé Hé!""", page.asText().strip()) ...@@ -1646,6 +1680,364 @@ Hé Hé Hé!""", page.asText().strip())
self.tic() self.tic()
self.assertEqual(web_site.WebSection_getEventResourceItemList(), [('', '')]) self.assertEqual(web_site.WebSection_getEventResourceItemList(), [('', '')])
def test_caching_policy_no_store(self):
"""Even as anonnymous we expect that no Last-Modified
is provided, and no-store on cache control.
This test check 1 Policy installed by erp5_web:
Policy ID - no store
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('no-store')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_caching_policy_no_cache(self):
"""This test check 1 Policy installed by erp5_web:
Policy ID - no cache
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('no-cache')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=0, no-cache')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-cache')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_caching_policy_one_year_cache(self):
""" Only works as unauthenticated user
This test check 1 Policy installed by erp5_web:
Policy ID - one-year-cache
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('one-year-cache')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertTrue(last_modified_header)
from App.Common import rfc1123_date
# Convert the Date into string according RFC 1123 Time Format
modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=31536000, stale-while-revalidate=31536000, stale-if-error=31536000, public')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
'Cookie, Authorization, Accept-Encoding')
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_caching_policy_one_day_max_modification_date_cache(self):
""" Only works as unauthenticated user
This test check 1 Policy installed by erp5_web:
Policy ID - one-day-max-modification-date
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('one-day-max-modification-date')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertTrue(last_modified_header)
from App.Common import rfc1123_date
# Convert the Date into string according RFC 1123 Time Format
modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=600, stale-while-revalidate=360000, stale-if-error=31536000, public')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
'Cookie, Authorization, Accept-Encoding')
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_caching_policy_one_hour_max_modification_date_cache(self):
""" Only works as unauthenticated user
This test check 1 Policy installed by erp5_web:
Policy ID - one-hour-max-modification-date
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('one-hour-max-modification-date')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertTrue(last_modified_header)
from App.Common import rfc1123_date
# Convert the Date into string according RFC 1123 Time Format
modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=600, stale-while-revalidate=360000, stale-if-error=31536000, public')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
'Cookie, Authorization, Accept-Encoding')
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
self.assertFalse(last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header, 'max-age=0, no-store')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header, None)
def test_caching_policy_must_revalidate_cache(self):
"""
This test check 1 Policy installed by erp5_web:
Policy ID - must-revalidate
"""
website = self.setupWebSite()
web_section_portal_type = 'Web Section'
website.newContent(portal_type=web_section_portal_type)
# It expected
website.setCachingPolicy('must-revalidate')
content = '<p>initial text</p>'
document = self.portal.web_page_module.newContent(portal_type='Web Page',
id='document_cache',
reference='NXD-Document.Cache',
text_content=content)
document.publish()
# clear cache used in Base_getWebDocumentDrivenModificationDate
self.portal.portal_caches.clearAllCache()
self.tic()
path = website.absolute_url_path() + '/NXD-Document.Cache'
# test Different Policy installed by erp5_web
# unauthenticated web pages
response = self.publish(path)
last_modified_header = response.getHeader('Last-Modified')
self.assertTrue(last_modified_header)
from App.Common import rfc1123_date
# Convert the Date into string according RFC 1123 Time Format
modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=0, public, must-revalidate')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
'Accept-Language, Cookie, Authorization, Accept-Encoding')
# retry after login
user = self.createUser('webmaster')
self.createUserAssignement(user, {})
self.tic()
response = self.publish(path, 'webmaster:webmaster')
last_modified_header = response.getHeader('Last-Modified')
modification_date = rfc1123_date(document.getModificationDate())
self.assertEqual(modification_date, last_modified_header)
# Check cache control
cache_control_header = response.getHeader('Cache-Control')
self.assertEqual(cache_control_header,
'max-age=0, public, must-revalidate')
# Check Vary
cache_control_header = response.getHeader('Vary')
self.assertEqual(cache_control_header,
"Accept-Language, Cookie, Authorization, Accept-Encoding")
class TestERP5WebWithSimpleSecurity(ERP5TypeTestCase): class TestERP5WebWithSimpleSecurity(ERP5TypeTestCase):
""" """
Test for erp5_web with simple security. Test for erp5_web with simple security.
......
bt5/erp5_web/ToolTemplateItem/caching_policy_manager.xml
View file @ eb616c1e
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<key> <string>_policy_ids</string> </key> <key> <string>_policy_ids</string> </key>
<value> <value>
<tuple> <tuple>
<string>no-store</string>
<string>no-cache</string> <string>no-cache</string>
<string>one-year-cache</string> <string>one-year-cache</string>
<string>one-day-max-modification-date</string> <string>one-day-max-modification-date</string>
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
</item> </item>
<item> <item>
<key> <string>_last_modified</string> </key> <key> <string>_last_modified</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>_max_age_secs</string> </key> <key> <string>_max_age_secs</string> </key>
...@@ -586,6 +587,111 @@ ...@@ -586,6 +587,111 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>no-store</string> </key>
<value>
<object>
<klass> <reference id="2.1"/> </klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_enable_304s</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_etag_func</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_last_modified</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_max_age_secs</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_mtime_func</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_must_revalidate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_no_cache</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_no_store</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>_no_transform</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_policy_id</string> </key>
<value> <string>no-store</string> </value>
</item>
<item>
<key> <string>_post_check</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_pre_check</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_predicate</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_private</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_proxy_revalidate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_public</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_s_max_age_secs</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_stale_if_error_secs</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_stale_while_revalidate_secs</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>_vary</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item> <item>
<key> <string>one-day-max-modification-date</string> </key> <key> <string>one-day-max-modification-date</string> </key>
<value> <value>
...@@ -601,7 +707,7 @@ ...@@ -601,7 +707,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -615,7 +721,7 @@ ...@@ -615,7 +721,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -653,7 +759,7 @@ ...@@ -653,7 +759,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -706,7 +812,7 @@ ...@@ -706,7 +812,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -720,7 +826,7 @@ ...@@ -720,7 +826,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -758,7 +864,7 @@ ...@@ -758,7 +864,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -811,7 +917,7 @@ ...@@ -811,7 +917,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABs=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -825,7 +931,7 @@ ...@@ -825,7 +931,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAABw=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -863,7 +969,7 @@ ...@@ -863,7 +969,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAB0=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -916,7 +1022,7 @@ ...@@ -916,7 +1022,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABs=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAB4=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -930,7 +1036,7 @@ ...@@ -930,7 +1036,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAABw=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAB8=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -968,7 +1074,7 @@ ...@@ -968,7 +1074,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAB0=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACA=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1021,7 +1127,7 @@ ...@@ -1021,7 +1127,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAB4=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACE=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1035,7 +1141,7 @@ ...@@ -1035,7 +1141,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAB8=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1073,7 +1179,7 @@ ...@@ -1073,7 +1179,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACA=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1126,7 +1232,7 @@ ...@@ -1126,7 +1232,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACE=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACQ=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1140,7 +1246,7 @@ ...@@ -1140,7 +1246,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACU=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1178,7 +1284,7 @@ ...@@ -1178,7 +1284,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACY=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1231,7 +1337,7 @@ ...@@ -1231,7 +1337,7 @@
<item> <item>
<key> <string>_etag_func</string> </key> <key> <string>_etag_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACc=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1245,7 +1351,7 @@ ...@@ -1245,7 +1351,7 @@
<item> <item>
<key> <string>_mtime_func</string> </key> <key> <string>_mtime_func</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACU=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACg=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1283,7 +1389,7 @@ ...@@ -1283,7 +1389,7 @@
<item> <item>
<key> <string>_predicate</string> </key> <key> <string>_predicate</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAACY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAACk=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -1517,7 +1623,7 @@ ...@@ -1517,7 +1623,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<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: (lambda x: x is not None and x.getCachingPolicy() == \'no-cache\')(object.getWebSectionValue())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1543,7 +1649,7 @@ ...@@ -1543,7 +1649,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime())</string> </value> <value> <string>object/modified</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1556,7 +1662,7 @@ ...@@ -1556,7 +1662,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<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: (lambda x: x is not None and x.getCachingPolicy() == \'no-store\')(object.getWebSectionValue())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1582,7 +1688,7 @@ ...@@ -1582,7 +1688,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime() + (DateTime().hour() /24.0))</string> </value> <value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1595,7 +1701,7 @@ ...@@ -1595,7 +1701,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<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: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-day-max-modification-date\')(object.getWebSectionValue())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1621,7 +1727,7 @@ ...@@ -1621,7 +1727,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)()</string> </value> <value> <string>python: max(getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)(), DateTime().earliestTime() + (DateTime().hour() /24.0))</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1634,7 +1740,7 @@ ...@@ -1634,7 +1740,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: member is None and (lambda x: x is not None and x.getCachingPolicy() == \'one-year-cache\')(object.getWebSectionValue())</string> </value> <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>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1660,7 +1766,7 @@ ...@@ -1660,7 +1766,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value> <value> <string>python: getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1673,7 +1779,7 @@ ...@@ -1673,7 +1779,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<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 x.getCachingPolicy() == \'one-year-cache\')(object.getWebSectionValue())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1712,7 +1818,7 @@ ...@@ -1712,7 +1818,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <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> <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>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1738,7 +1844,7 @@ ...@@ -1738,7 +1844,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python: getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)()</string> </value> <value> <string>python: getattr(object, \'getModificationDate\', object.modified)()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1751,7 +1857,7 @@ ...@@ -1751,7 +1857,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <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> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -1783,6 +1889,45 @@ ...@@ -1783,6 +1889,45 @@
</pickle> </pickle>
</record> </record>
<record id="38" aka="AAAAAAAAACY="> <record id="38" aka="AAAAAAAAACY=">
<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="39" aka="AAAAAAAAACc=">
<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="40" aka="AAAAAAAAACg=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: getattr(object, \'Base_getWebDocumentDrivenModificationDate\', object.modified)()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="41" aka="AAAAAAAAACk=">
<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