Commit 30c602a3 authored by Kevin Deldycke's avatar Kevin Deldycke

Always return a string

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8769 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2f1fadb2
...@@ -71,11 +71,14 @@ ...@@ -71,11 +71,14 @@
<value> <string>#XXX This script should be named WebSite_getDocument\n <value> <string>#XXX This script should be named WebSite_getDocument\n
document = context.WebSite_getDocumentValue()\n document = context.WebSite_getDocumentValue()\n
if document is not None:\n if document is not None:\n
doc_url = context.WebSite_getSection()\n section_url = context.WebSite_getSection()\n
doc_ref = document.getReference()\n if section_url is not None:\n
if doc_ref is not None:\n doc_ref = document.getReference()\n
doc_url += \'/%s\' % doc_ref\n if doc_ref is not None:\n
return doc_url\n return \'%s/%s\' % (section_url, doc_ref)\n
return section_url\n
else:\n
return document.absolute_url()\n
return context.WebSite_getUrl()\n return context.WebSite_getUrl()\n
</string> </value> </string> </value>
</item> </item>
...@@ -123,7 +126,7 @@ return context.WebSite_getUrl()\n ...@@ -123,7 +126,7 @@ return context.WebSite_getUrl()\n
<string>context</string> <string>context</string>
<string>document</string> <string>document</string>
<string>None</string> <string>None</string>
<string>doc_url</string> <string>section_url</string>
<string>doc_ref</string> <string>doc_ref</string>
</tuple> </tuple>
</value> </value>
......
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