Merge lp:~openerp-dev/openobject-server/trunk-addons21-nco into lp:openobject-server

[Nimesh Contractor(Open ERP)]

Hello,

      Fix the trace-back when creating a database with a name that already exists.
      Make create button invisible on module tree view.

Thanks,
Nimesh.

Unmerged revisions

4599. By Nimesh Contractor(Open ERP) on 2012-12-03

[MERGE] merge with lp:openobject-server

4598. By Nimesh Contractor(Open ERP) on 2012-11-30

[MERGE] merge with lp:openobject-server

4597. By Atul Patel(OpenERP) on 2012-11-29

[MERGE]: Merged with lp:openobject-server

4596. By Nimesh Contractor(Open ERP) on 2012-11-28

[MERGE] lp:openobject-server

4595. By Nimesh Contractor(Open ERP) on 2012-11-26

[MERGE] merged lp:~openerp-dev/openobject-server/trunk-addons21-settings-pja

4594. By Nimesh Contractor(Open ERP) on 2012-11-26

[MERGE] merge lp:~openerp-dev/openobject-server/trunk-addons21-general-dbname-pja

=== modified file 'openerp/service/web_services.py'
--- openerp/service/web_services.py	2012-11-29 11:43:02 +0000
+++ openerp/service/web_services.py	2012-12-03 11:48:23 +0000
@@ -120,6 +120,12 @@
         db = sql_db.db_connect('postgres')
         cr = db.cursor()
         chosen_template = tools.config['db_template']
+        cr.execute("""SELECT datname 
+                              FROM pg_database
+                              WHERE datname = %s """,
+                           (name,))
+        if cr.fetchall():
+            raise openerp.exceptions.Warning(" %s database already exists!" % name )
         try:
             cr.autocommit(True) # avoid transaction block
             cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (name, chosen_template))