# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1254221123 -7200
# Node ID e3ce9db1133cb770ee63b1e1d4a8460b8b441e1e
# Parent  11ce4682187da7bb61246f8ca7f712cecc901a1b# Parent  711cff0a83dd8b1dfc0c0714877b1b80ac2c38a8
merge

diff -r 11ce4682187d -r e3ce9db1133c server/hooks.py
--- a/server/hooks.py	Tue Sep 29 12:44:50 2009 +0200
+++ b/server/hooks.py	Tue Sep 29 12:45:23 2009 +0200
@@ -568,7 +568,7 @@
 def before_add_in_state(session, eidfrom, rtype, eidto):
     """check state apply, in case of direct in_state change using unsafe_execute
     """
-    nocheck = session.transaction_data.setdefault('skip-security', ())
+    nocheck = session.transaction_data.setdefault('skip-security', set())
     if (eidfrom, 'in_state', eidto) in nocheck:
         # state changed through TrInfo insertion, so we already know it's ok
         return
diff -r 11ce4682187d -r e3ce9db1133c web/views/formrenderers.py
--- a/web/views/formrenderers.py	Tue Sep 29 12:44:50 2009 +0200
+++ b/web/views/formrenderers.py	Tue Sep 29 12:45:23 2009 +0200
@@ -370,16 +370,19 @@
     # needs some additional points in some case (XXX explain cases)
     __select__ = EntityBaseFormRenderer.__select__ & yes()
 
-    _options = FormRenderer._options + ('display_relations_form',)
+    _options = FormRenderer._options + ('display_relations_form', 'main_form_title')
     display_relations_form = True
+    main_form_title = _('main information')
 
     def render(self, form, values):
         rendered = super(EntityFormRenderer, self).render(form, values)
         return rendered + u'</div>' # close extra div introducted by open_form
 
     def open_form(self, form, values):
-        attrs_fs_label = ('<div class="iformTitle"><span>%s</span></div>'
-                          % self.req._('main informations'))
+        attrs_fs_label = ''
+        if self.main_form_title:
+            attrs_fs_label += ('<div class="iformTitle"><span>%s</span></div>'
+                               % self.req._(self.main_form_title))
         attrs_fs_label += '<div class="formBody">'
         return attrs_fs_label + super(EntityFormRenderer, self).open_form(form, values)