[Erp5-report] r9305 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplate...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Aug 22 11:04:25 CEST 2006


Author: kevin
Date: Tue Aug 22 11:04:22 2006
New Revision: 9305

URL: http://svn.erp5.org?rev=9305&view=rev
Log:
Unset editable_mode when viewing an object through Web Site object.

Added:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/id_generator
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/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version

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=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml Tue Aug 22 11:04:22 2006
@@ -86,12 +86,14 @@
 -->\n
 </tal:block>\n
 <tal:block metal:define-macro="master">\n
-  <tal:block tal:define="ignore_layout          request/ignore_layout | nothing;\n
-                         layout_form_id         here/getApplicableLayout | nothing;\n
-                         editable_mode  python: layout_form_id and request.get(\'editable_mode\', ignore_layout) or 1;\n
-                         dummy          python: request.set(\'editable_mode\', editable_mode);\n
-                         layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
-                         page_template  python: (layout_form and not(ignore_layout)) and getattr(layout_form, \'pt\', None) or \'template_erp5_xhtml_style\';">\n
+  <tal:block\n
+   tal:define="ignore_layout          request/ignore_layout | nothing;\n
+               layout_form_id         here/getApplicableLayout | nothing;\n
+               is_edit_mode   python: not (not(hasattr(context.REQUEST, \'editable_mode\')) or not(context.REQUEST[\'editable_mode\']));\n
+               editable_mode  python: layout_form_id in (\'\', None) and True or (is_edit_mode or ignore_layout);\n
+               dummy          python: request.set(\'editable_mode\', editable_mode);\n
+               layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
+               page_template  python: (layout_form and not(ignore_layout)) and getattr(layout_form, \'pt\', None) or \'template_erp5_xhtml_style\';">\n
     <tal:block metal:use-macro="python: getattr(here, page_template).macros[\'master\']">\n
       <tal:block metal:fill-slot="context_bar">\n
         <tal:block metal:define-slot="context_bar"/>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Tue Aug 22 11:04:22 2006
@@ -1,3 +1,6 @@
+2006-08-22 Kevin
+* Unset editable_mode when viewing an object through Web Site object.
+
 2006-08-21 Kevin
 * Include support for editable_mode parameter in main_template.
 * Remove default value (by jp).

Added: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/id_generator
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/id_generator?rev=9305&view=auto
==============================================================================
    (empty)

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=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Tue Aug 22 11:04:22 2006
@@ -1,1 +1,1 @@
-99
+100

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version?rev=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/version Tue Aug 22 11:04:22 2006
@@ -1,1 +1,1 @@
-1.2.6
+1.2.7




More information about the Erp5-report mailing list