# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1274344855 -7200
# Node ID d29d1a1ce15d27ee68949cda4444ef96d8b0da62
# Parent  26be1e50e2cf91ad380430c33937d190ee8c6c06# Parent  1bdaa9e1cd57d786c95ff3e9af6d84659b6b1332
merge

diff -r 26be1e50e2cf -r d29d1a1ce15d devtools/__init__.py
--- 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
diff -r 26be1e50e2cf -r d29d1a1ce15d server/sources/native.py
--- 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):
diff -r 26be1e50e2cf -r d29d1a1ce15d web/views/basecontrollers.py
--- 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: