From ff52f89476f6b0c4ba93b3fac19c0c9d25200172 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Mon, 28 Aug 2006 15:00:16 +0000
Subject: [PATCH] Try to get form from 'form' variable before
'current_form_id'.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9512 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_xhtml_style/developper_shortcut_render.xml | 2 +-
product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log | 7 ++++---
product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +-
product/ERP5/bootstrap/erp5_xhtml_style/bt/version | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml
index e8a2758716..1f9d0b1e8b 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml
@@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
alt info;"/></a>\n
</tal:block>\n
<tal:block metal:define-macro="form"\n
- tal:define="form python: getattr(here, current_form_id, None)"\n
+ tal:define="form python: (hasattr(here, \'form\') and here.form) or (hasattr(here, \'current_form_id\') and getattr(here, current_form_id, None))"\n
tal:condition="python: context.Base_getSourceVisibility(form)">\n
<tal:block tal:define="image python: \'editform.png\';\n
info python: \'Edit this form\';\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
index 8733c5721c..1e741cec57 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
@@ -1,8 +1,9 @@
-2006-08-28 JP
-* Trash widget_render. field_render should be used instead.
-
2006-08-28 Kevin
* Test form accessibility earlier in developper_shortcut_render to let login_form be rendered in erp5_web when anonymous.
+* Try to get form from 'form' variable before 'current_form_id'.
+
+2006-08-28 JP
+* Trash widget_render. field_render should be used instead.
2006-08-25 Kevin
* Move hidden input and globals definition code to separate file.
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index c2807f7f3c..83248fb9df 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-140
\ No newline at end of file
+142
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
index 21344eb17a..5ab1538853 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
@@ -1 +1 @@
-1.2.17
\ No newline at end of file
+1.2.18
\ No newline at end of file
--
2.30.9