Skip to content

erp5
erp5
Commit 0e0f2f22 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

2010-02-02 fabien 

* remove WebSection_getPermanentURLForView which was bad (see bug #1507) and use getPermanentUrl() from WebSection.py.
* WebSection_getPermanentUrl script is not used anymore (and should never be used, it should be called only by getPermanentUrl() from WebSection.py). Now by default, getPermanentUrl(document) always return a link to html content. If you want to get a link to a file (ie. openoffice document, pdf document, ...) you should explicitly specify it :
getPermanentUrl(document, view=False)

Reviewed by Kazuhiko

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32176 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d1074720
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 146 deletions
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml
View file @ 0e0f2f22
...@@ -80,6 +80,9 @@ ...@@ -80,6 +80,9 @@
document reference.\n document reference.\n
\n \n
The document parameter is required.\n The document parameter is required.\n
\n
If view is True, the url returned point to html content and can be opened in\n
a browser (ie. + \'/view\' for ooo documents)\n
\n \n
More sophisticated behaviours are possible.\n More sophisticated behaviours are possible.\n
\n \n
...@@ -91,9 +94,14 @@ ...@@ -91,9 +94,14 @@
- change the behaviour of WebSection_getPermanentURL\n - change the behaviour of WebSection_getPermanentURL\n
for documents which are not published.\n for documents which are not published.\n
"""\n """\n
html_portal_type_list = (\'Web Site\', \'Web Section\', \'Web Page\')\n
portal_type = document.getPortalType()\n
\n
# If no reference is defined, no way to build a permanent URL.\n # If no reference is defined, no way to build a permanent URL.\n
reference = document.getReference()\n reference = document.getReference()\n
if not reference:\n if not reference:\n
if view and portal_type not in html_portal_type_list:\n
return \'%s/view\' % document.absolute_url()\n
return document.absolute_url()\n return document.absolute_url()\n
\n \n
# Return absolute URL if this is not an appropriate portal_type\n # Return absolute URL if this is not an appropriate portal_type\n
...@@ -101,15 +109,21 @@ portal = context.getPortalObject()\n ...@@ -101,15 +109,21 @@ portal = context.getPortalObject()\n
valid_portal_type_list = portal.getPortalDocumentTypeList()\n valid_portal_type_list = portal.getPortalDocumentTypeList()\n
portal_type = document.getPortalType()\n portal_type = document.getPortalType()\n
if portal_type not in valid_portal_type_list:\n if portal_type not in valid_portal_type_list:\n
if view and portal_type not in html_portal_type_list:\n
return \'%s/view\' % document.absolute_url()\n
return document.absolute_url()\n return document.absolute_url()\n
\n \n
# Return absolute URL if this is not a \'live\' document\n # Return absolute URL if this is not a \'live\' document\n
validation_state = (\'released\', \'released_alive\', \'published\', \'published_alive\',\n validation_state = (\'released\', \'released_alive\', \'published\', \'published_alive\',\n
\'shared\', \'shared_alive\', \'public\', \'validated\')\n \'shared\', \'shared_alive\', \'public\', \'validated\')\n
if document.getValidationState() not in validation_state:\n if document.getValidationState() not in validation_state:\n
if view and portal_type not in html_portal_type_list:\n
return \'%s/view\' % document.absolute_url()\n
return document.absolute_url()\n return document.absolute_url()\n
\n \n
# Return the URL\n # Return the URL\n
if view and portal_type not in html_portal_type_list:\n
return \'%s/%s/view\' % (context.absolute_url(), reference)\n
return "%s/%s" % (context.absolute_url(), reference)\n return "%s/%s" % (context.absolute_url(), reference)\n
</string> </value> </string> </value>
</item> </item>
...@@ -121,7 +135,7 @@ return "%s/%s" % (context.absolute_url(), reference)\n ...@@ -121,7 +135,7 @@ return "%s/%s" % (context.absolute_url(), reference)\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>document</string> </value> <value> <string>document, view=True</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -141,19 +155,21 @@ return "%s/%s" % (context.absolute_url(), reference)\n ...@@ -141,19 +155,21 @@ return "%s/%s" % (context.absolute_url(), reference)\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>view</string>
<string>html_portal_type_list</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>portal_type</string>
<string>reference</string> <string>reference</string>
<string>context</string> <string>context</string>
<string>portal</string> <string>portal</string>
<string>valid_portal_type_list</string> <string>valid_portal_type_list</string>
<string>portal_type</string>
<string>validation_state</string> <string>validation_state</string>
</tuple> </tuple>
</value> </value>
...@@ -166,7 +182,9 @@ return "%s/%s" % (context.absolute_url(), reference)\n ...@@ -166,7 +182,9 @@ return "%s/%s" % (context.absolute_url(), reference)\n
<item> <item>
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<none/> <tuple>
<int>1</int>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURLForView.xml deleted 100644 → 0
View file @ d1074720
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
return permanent url with "/view" add the end of the url for all portal_type\n
different from Web Page (Web Page can be displayed without "/view" and it\'s\n
better for cache).\n
"""\n
permanent_url = context.WebSection_getPermanentURL(document)\n
\n
# for web page, foo and foo/view are completely same\n
portal_type = document.getPortalType()\n
if portal_type == \'Web Page\':\n
return permanent_url\n
else:\n
return "%s/view" % permanent_url\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>document</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>document</string>
<string>_getattr_</string>
<string>context</string>
<string>permanent_url</string>
<string>portal_type</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebSection_getPermanentURLForView</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getSiteMapTree.xml
View file @ 0e0f2f22
...@@ -117,7 +117,7 @@ def getSiteMapItemTree(section, depth=0, level=None): \n ...@@ -117,7 +117,7 @@ def getSiteMapItemTree(section, depth=0, level=None): \n
if default_document is not None and default_document.getPhysicalPath() == document.getPhysicalPath():\n if default_document is not None and default_document.getPhysicalPath() == document.getPhysicalPath():\n
continue\n continue\n
result.append({\n result.append({\n
\'url\' : section.WebSection_getPermanentURLForView(document),\n \'url\' : section.getPermanentURL(document),\n
\'level\' : level,\n \'level\' : level,\n
\'section\' : None,\n \'section\' : None,\n
\'document\' : document,\n \'document\' : document,\n
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox_link.xml
View file @ 0e0f2f22
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:cell.WebSection_getPermanentURLForView(cell)</string> </value> <value> <string>python:cell.getPermanentURL(cell)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/breadcrumb.xml
View file @ 0e0f2f22
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
tal:condition="remaining_items">\n tal:condition="remaining_items">\n
<li tal:define="current_item python: remaining_items[0];\n <li tal:define="current_item python: remaining_items[0];\n
remaining_items python: remaining_items[1:]">\n remaining_items python: remaining_items[1:]">\n
<a tal:attributes="href python: \'%s/view\' % current_item[1].getPermanentURL(current_item[1]);\n <a tal:attributes="href python: current_item[1].getPermanentURL(current_item[1]);\n
class python: len(remaining_items) == 0 and \'selected\' or \'\'"\n class python: len(remaining_items) == 0 and \'selected\' or \'\'"\n
tal:content="python: current_item[0]"/>\n tal:content="python: current_item[0]"/>\n
<tal:block metal:use-macro="here/breadcrumb/macros/renderBreadcrumbItem"/>\n <tal:block metal:use-macro="here/breadcrumb/macros/renderBreadcrumbItem"/>\n
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/section_content_render.xml
View file @ 0e0f2f22
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</tal:block>\n </tal:block>\n
\n \n
<ul tal:repeat="document python:here.getDocumentValueList()">\n <ul tal:repeat="document python:here.getDocumentValueList()">\n
<li><a tal:attributes="href python:here.WebSection_getPermanentURLForView(document)"\n <li><a tal:attributes="href python:here.getPermanentUrl(document)"\n
tal:content="python: document.getProperty(\'translated_short_title\', None)\n tal:content="python: document.getProperty(\'translated_short_title\', None)\n
or document.getTranslatedTitleOrId()"/></li>\n or document.getTranslatedTitleOrId()"/></li>\n
</ul>\n </ul>\n
......
bt5/erp5_web/bt/change_log
View file @ 0e0f2f22
2010-02-02 fabien
* remove WebSection_getPermanentURLForView which was bad (see bug #1507) and use getPermanentUrl() from WebSection.py.
* WebSection_getPermanentUrl script is not used anymore (and should never be used, it should be called only by getPermanentUrl() from WebSection.py). Now by default, getPermanentUrl(document) always return a link to html content. If you want to get a link to a file (ie. openoffice document, pdf document, ...) you should explicitly specify it :
getPermanentUrl(document, view=False)
2010-01-22 nicolas 2010-01-22 nicolas
* Update configuration of Caching Policy Manager to fill Last-Modified Header with modification_date. * Update configuration of Caching Policy Manager to fill Last-Modified Header with modification_date.
* Web Site and Web Section are not using Caching Policy Manager * Web Site and Web Section are not using Caching Policy Manager
......
bt5/erp5_web/bt/revision
View file @ 0e0f2f22
904 905
\ No newline at end of file \ No newline at end of file
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