[Erp5-report] r32844 nicolas - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Ski...

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Feb 19 11:14:22 2010
New Revision: 32844

URL: http://svn.erp5.org?rev=32844&view=rev
Log:
editable_mode pass in URL take precedence on other statements.
* http://myerp5site.com/module/document_id?editable_mode:int=0 will return a read only Form.
* This patch do not break default behaviour
* Works also for WebSites.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml?rev=32844&r1=32843&r2=32844&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml [utf8] Fri Feb 19 11:14:22 2010
@@ -54,8 +54,9 @@
               layout_form_id         request/layout_form_id | here/getApplicableLayout | nothing;\n
               layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
               is_web_mode    python: (layout_form is not None) and (not ignore_layout);\n
-              editable_mode  python: (not is_web_mode) or request.get(\'editable_mode\', False);\n
-              editable_mode_backup editable_mode;\n
+              editable_mode  request/editable_mode | nothing;\n
+              dummy python: editable_mode is None and request.set(\'editable_mode\', (not is_web_mode));\n
+              editable_mode_backup request/editable_mode;\n
               dummy          python: request.set(\'editable_mode\', editable_mode);\n
               dummy          python: request.set(\'is_web_mode\', is_web_mode);\n
               page_template  python: is_web_mode and ((layout_form.meta_type==\'Page Template\' and layout_form.id) or getattr(layout_form, \'pt\', None)) or \'template_erp5_xhtml_style\';">\n
@@ -64,15 +65,14 @@
           <tal:block metal:define-slot="context_bar" />\n
         </tal:block>\n
         <tal:block metal:fill-slot="main"\n
-                   tal:define="editable_mode  editable_mode_backup;\n
+                   tal:define="editable_mode editable_mode_backup;\n
                    dummy python: request.set(\'editable_mode\', editable_mode);">\n
           <tal:block metal:define-slot="main" />\n
         </tal:block>\n
       </tal:block>\n
     </tal:block>\n
   </tal:block>\n
-</tal:block>\n
-
+</tal:block>
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=32844&r1=32843&r2=32844&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Fri Feb 19 11:14:22 2010
@@ -1,1 +1,1 @@
-899
+901