# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1280327492 -7200
# Node ID 09db6f4619c97c042da5736fd31fa6269f6a2f10
# Parent  52f9a43d8e084ea5148e8ce0ef09b6f582dee21b# Parent  4b721e739f530ab35c29b81f88d6a53951e10db5
backport stable

diff -r 52f9a43d8e08 -r 09db6f4619c9 server/msplanner.py
--- a/server/msplanner.py	Wed Jul 28 16:31:23 2010 +0200
+++ b/server/msplanner.py	Wed Jul 28 16:31:32 2010 +0200
@@ -1076,14 +1076,14 @@
 
         the rqlst should not be tagged at this point
         """
-        if server.DEBUG & server.DBG_MS:
-            print '-'*80
-            print 'PLANNING', rqlst
         # preprocess deals with security insertion and returns a new syntax tree
         # which have to be executed to fulfill the query: according
         # to permissions for variable's type, different rql queries may have to
         # be executed
         plan.preprocess(rqlst)
+        if server.DEBUG & server.DBG_MS:
+            print '-'*80
+            print 'PLANNING', rqlst
         ppis = [PartPlanInformation(plan, select, self.rqlhelper)
                 for select in rqlst.children]
         steps = self._union_plan(plan, ppis)
diff -r 52f9a43d8e08 -r 09db6f4619c9 server/session.py
--- a/server/session.py	Wed Jul 28 16:31:23 2010 +0200
+++ b/server/session.py	Wed Jul 28 16:31:32 2010 +0200
@@ -783,7 +783,7 @@
                     except:
                         self.critical('error while %sing', trstate,
                                       exc_info=sys.exc_info())
-                self.info('%s session %s done', trstate, self.id)
+                self.debug('%s session %s done', trstate, self.id)
                 return self.transaction_uuid(set=False)
         finally:
             self._touch()
diff -r 52f9a43d8e08 -r 09db6f4619c9 web/test/unittest_viewselector.py
--- a/web/test/unittest_viewselector.py	Wed Jul 28 16:31:23 2010 +0200
+++ b/web/test/unittest_viewselector.py	Wed Jul 28 16:31:32 2010 +0200
@@ -41,7 +41,7 @@
 SITEACTIONS = [actions.SiteConfigurationAction,
                actions.ManageAction,
                schema.ViewSchemaAction,
-               actions.SiteInfoAction]
+               debug.SiteInfoAction]
 FOOTERACTIONS = [wdoc.HelpAction,
                  wdoc.ChangeLogAction,
                  wdoc.AboutAction,
diff -r 52f9a43d8e08 -r 09db6f4619c9 web/views/editcontroller.py
--- a/web/views/editcontroller.py	Wed Jul 28 16:31:23 2010 +0200
+++ b/web/views/editcontroller.py	Wed Jul 28 16:31:32 2010 +0200
@@ -177,7 +177,7 @@
         """edit / create / copy an entity and return its eid"""
         etype = formparams['__type']
         entity = self._cw.vreg['etypes'].etype_class(etype)(self._cw)
-        entity.eid = formparams['eid']
+        entity.eid = valerror_eid(formparams['eid'])
         is_main_entity = self._cw.form.get('__maineid') == formparams['eid']
         # let a chance to do some entity specific stuff
         entity.cw_adapt_to('IEditControl').pre_web_edit()