Skip to content

Commit

Permalink
Fixed title and description of max age in strong caching rule for res…
Browse files Browse the repository at this point in the history 
…ources.

They wrongly were the same as for shared max age.
Fixes plone/Products.CMFPlone#1989.
  • Loading branch information
@mauritsvanrees
mauritsvanrees committed Mar 31, 2017
1 parent ff21c9b commit b3d0478
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGES.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ New features:

Bug fixes:

- *add item here*
- Fixed title and description of max age in strong caching rule for resources.
They wrongly were the same as for shared max age.
Fixes `issue 1989 <https://github.com/plone/Products.CMFPlone/issues/1989>`_.
[maurits]


1.2.16 (2017-03-23)
Expand Down
4 changes: 2 additions & 2 deletions plone/app/caching/profiles/with-caching-proxy/registry.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<!-- plone.resource-->
<record name="plone.app.caching.strongCaching.plone.resource.maxage">
<field ref="plone.app.caching.strongCaching.smaxage" />
<field ref="plone.app.caching.strongCaching.maxage" />
<value>86400</value>
</record>
<record name="plone.app.caching.strongCaching.plone.resource.lastModified">
Expand All @@ -102,4 +102,4 @@
</record>


</registry>
</registry>

1 comment on commit b3d0478

@jenkins-plone-org
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mauritsvanrees Jenkins CI reporting about code analysis
See the full report here: http://jenkins.plone.org/job/package-plone.app.caching/14/violations

plone/app/caching/lookup.py:57:1: C901 'ContentItemLookup.__call__' is too complex (12)
plone/app/caching/testing.py:49:9: D001 found xmlconfig.file( replace it with self.loadZCML(
plone/app/caching/interfaces.py:41:17: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:42:23: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:43:43: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:44:46: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:48:17: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:49:23: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:50:43: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:51:46: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:55:17: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:57:13: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:58:45: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:63:17: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:65:13: Q000 Remove bad quotes.
plone/app/caching/interfaces.py:66:45: Q000 Remove bad quotes.
plone/app/caching/browser/controlpanel.py:88:1: C901 'ControlPanel.publishTraverse' is too complex (11)
plone/app/caching/browser/controlpanel.py:170:1: C901 'ControlPanel.processSave' is too complex (33)
plone/app/caching/browser/controlpanel.py:561:1: C901 'Purge.processPurge' is too complex (19)
plone/app/caching/browser/edit.py:229:22: Q000 Remove bad quotes.
plone/app/caching/browser/edit.py:233:22: Q000 Remove bad quotes.
plone/app/caching/browser/edit.py:261:15: Q000 Remove bad quotes.
plone/app/caching/browser/edit.py:285:15: Q000 Remove bad quotes.
plone/app/caching/operations/default.py:142:1: C901 'BaseCaching.modifyResponse' is too complex (11)
plone/app/caching/operations/default.py:339:15: Q000 Remove bad quotes.
plone/app/caching/operations/default.py:340:21: Q000 Remove bad quotes.
plone/app/caching/operations/default.py:341:21: Q000 Remove bad quotes.
plone/app/caching/operations/utils.py:362:1: C901 'isModified' is too complex (14)
plone/app/caching/tests/test_profile_with_caching_proxy.py:103:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:108:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:109:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:150:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:165:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:184:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:229:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:246:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:266:26: S001 found module formatter
plone/app/caching/tests/test_profile_with_caching_proxy.py:418:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:419:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:424:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_with_caching_proxy.py:425:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:88:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:89:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:97:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:98:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:100:13: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:112:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:113:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:120:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:121:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:172:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:173:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:175:13: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:206:60: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:222:60: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:238:60: Q000 Remove bad quotes.
plone/app/caching/tests/test_integration.py:254:60: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_default.py:46:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_default.py:47:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:94:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:95:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:100:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:101:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:413:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:414:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:419:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_profile_without_caching_proxy.py:420:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:54:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:83:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:112:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:144:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:198:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:293:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:319:48: Q000 Remove bad quotes.
plone/app/caching/tests/test_etags.py:343:48: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_parameters.py:43:35: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_parameters.py:44:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_parameters.py:49:41: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_parameters.py:50:47: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:412:55: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:414:26: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:445:45: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:447:26: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:480:45: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:482:26: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:505:26: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:524:26: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:740:43: E127 continuation line over-indented for visual indent
plone/app/caching/tests/test_operation_utils.py:1090:38: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1103:38: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1128:38: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1141:38: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1335:18: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1349:18: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1378:18: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1414:18: Q000 Remove bad quotes.
plone/app/caching/tests/test_operation_utils.py:1447:18: Q000 Remove bad quotes.

Follow these instructions to reproduce it locally.

Please sign in to comment.