[Erp5-report] r38546 kazuhiko - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Sep 22 16:21:36 2010
New Revision: 38546

URL: http://svn.erp5.org?rev=38546&view=rev
Log:
2010-09-22 kazuhiko
* use Web Section's url in WebSection_getPermanentURL script, if it is called against a document.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml
    erp5/trunk/bt5/erp5_web/bt/change_log
    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=38546&r1=38545&r2=38546&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] Wed Sep 22 16:21:36 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -126,7 +123,10 @@ if document.getValidationState() not in 
 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
+web_section = context.getWebSectionValue()\n
+if web_section is None:\n
+  web_section = context\n
+return "%s/%s" % (web_section.absolute_url(), reference)\n
 </string> </value>
         </item>
         <item>
@@ -173,6 +173,8 @@ return "%s/%s" % (context.absolute_url()
                             <string>portal</string>
                             <string>valid_portal_type_list</string>
                             <string>validation_state</string>
+                            <string>web_section</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_web/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/change_log?rev=38546&r1=38545&r2=38546&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/change_log [utf8] Wed Sep 22 16:21:36 2010
@@ -1,3 +1,6 @@
+2010-09-22 kazuhiko
+* use Web Section's url in WebSection_getPermanentURL script, if it is called against a document.
+
 2010-03-05 fabien
 * fix caches id bug. Now caches should works much better.
 

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=38546&r1=38545&r2=38546&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Wed Sep 22 16:21:36 2010
@@ -1 +1 @@
-976
\ No newline at end of file
+977
\ No newline at end of file