merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Thu, 20 May 2010 10:40:55 +0200
branchstable
changeset 5548 d29d1a1ce15d
parent 5547 26be1e50e2cf (current diff)
parent 5546 1bdaa9e1cd57 (diff)
child 5549 ab3a69a34626
merge
--- a/devtools/__init__.py	Thu May 20 10:40:29 2010 +0200
+++ b/devtools/__init__.py	Thu May 20 10:40:55 2010 +0200
@@ -278,7 +278,6 @@
 def init_test_database_sqlite(config):
     """initialize a fresh sqlite databse used for testing purpose"""
     # remove database file if it exists
-    dbfile = config.sources()['system']['db-name']
     if not reset_test_database_sqlite(config):
         # initialize the database
         import shutil
--- a/server/sources/native.py	Thu May 20 10:40:29 2010 +0200
+++ b/server/sources/native.py	Thu May 20 10:40:55 2010 +0200
@@ -33,6 +33,7 @@
 from datetime import datetime
 from base64 import b64decode, b64encode
 from contextlib import contextmanager
+from os.path import abspath
 
 from logilab.common.compat import any
 from logilab.common.cache import Cache
@@ -264,6 +265,7 @@
         if self.dbdriver == 'sqlite' and \
                not getattr(repo.config, 'no_sqlite_wrap', False):
             from cubicweb.server.sources.extlite import ConnectionWrapper
+            self.dbhelper.dbname = abspath(self.dbhelper.dbname)
             self.get_connection = lambda: ConnectionWrapper(self)
             self.check_connection = lambda cnx: cnx
             def pool_reset(cnx):
--- a/web/views/basecontrollers.py	Thu May 20 10:40:29 2010 +0200
+++ b/web/views/basecontrollers.py	Thu May 20 10:40:55 2010 +0200
@@ -314,6 +314,9 @@
         for name, value in zip(names, values):
             # remove possible __action_xxx inputs
             if name.startswith('__action'):
+                if action is None:
+                    # strip '__action_' to get the actual action name
+                    action = name[9:]
                 continue
             # form.setdefault(name, []).append(value)
             if name in form: