[Erp5-report] r37284 lucas - in /erp5/trunk/bt5/tiolive_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: lucas
Date: Tue Jul 27 15:01:53 2010
New Revision: 37284

URL: http://svn.erp5.org?rev=37284&view=rev
Log:
Added include_language argument.
Sometimes we don't need the language on the url.

Modified:
    erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
    erp5/trunk/bt5/tiolive_base/bt/revision

Modified: erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml?rev=37284&r1=37283&r2=37284&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml [utf8] Tue Jul 27 15:01:53 2010
@@ -64,7 +64,7 @@ language = context.Localizer.get_selecte
 # websites are usually not included in the url. But this\n
 # script is also used in tiolive instances, and from them\n
 # it is impossible to have the configuration of the web site\n
-if language is not None:\n
+if language is not None and include_language:\n
   root_url = "%s/%s" % (root_url, language)\n
   \n
 return root_url\n
@@ -78,7 +78,7 @@ return root_url\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>include_language=1</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -98,12 +98,13 @@ return root_url\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>include_language</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>root_url</string>
@@ -120,7 +121,9 @@ return root_url\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <int>1</int>
+              </tuple>
             </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/tiolive_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/bt/revision?rev=37284&r1=37283&r2=37284&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/bt/revision [utf8] Tue Jul 27 15:01:53 2010
@@ -1 +1 @@
-67
\ No newline at end of file
+68
\ No newline at end of file