[Erp5-report] r36361 ivan - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Jun 15 16:42:00 2010
New Revision: 36361

URL: http://svn.erp5.org?rev=36361&view=rev
Log:
Generate Web Page permanent URL in the same way as any other document types.
(even though Web Page can in theory be considered a proper HTML document directly accessing it without wrapper site UI is not default preferred option).

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml?rev=36361&r1=36360&r2=36361&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml [utf8] Tue Jun 15 16:42:00 2010
@@ -94,7 +94,7 @@
  - change the behaviour of WebSection_getPermanentURL\n
    for documents which are not published.\n
 """\n
-html_portal_type_list = (\'Web Site\', \'Web Section\', \'Web Page\')\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
@@ -109,6 +109,7 @@ portal = context.getPortalObject()\n
 valid_portal_type_list = portal.getPortalDocumentTypeList()\n
 portal_type = document.getPortalType()\n
 if portal_type not in valid_portal_type_list:\n
+\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
@@ -124,6 +125,7 @@ if document.getValidationState() not in 
 # 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
+\n
 return "%s/%s" % (context.absolute_url(), reference)\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=36361&r1=36360&r2=36361&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Tue Jun 15 16:42:00 2010
@@ -1 +1 @@
-961
\ No newline at end of file
+962
\ No newline at end of file