From 38340f448d069bf44ce685b99594491abed2ed17 Mon Sep 17 00:00:00 2001
From: "noz (OpenERP)" <noz@tinyerp.com>
Date: Fri, 1 Jul 2011 17:54:30 +0530
Subject: [PATCH] [FIX] Created common method for all Database operations.

bzr revid: noz@tinyerp.com-20110701122430-lhomemgtfay5jeev
---
 addons/base/controllers/main.py     | 19 ++++++++++---------
 addons/base/static/src/js/chrome.js |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 8d3069cc190..56328489a5b 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -121,16 +121,17 @@ class Session(openerpweb.Controller):
         return {"lang_list": lang_list}
     
     @openerpweb.jsonrequest
-    def drop_db(self, req, **kw):
+    def db_operation(self, req, flag, **kw):
         
-        db = kw.get('db')
-        password = kw.get('password')
-        try:
-            res = req.session.proxy("db").drop(password, db)
-            if res:
-                return res
-        except TypeError:
-            return {'error': e}
+        if flag == 'drop':
+            db = kw.get('db')
+            password = kw.get('password')
+            try:
+                res = req.session.proxy("db").drop(password, db)
+                if res:
+                    return res
+            except TypeError:
+                return {'error': e}
             
     @openerpweb.jsonrequest
     def modules(self, req):
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index a2a243790df..7e19d138ff0 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -944,7 +944,7 @@ openerp.base.Database = openerp.base.Controller.extend({
 		        var password = self.$option_id.find("input[name=drop_password]").val();
 	        	
 	        	if (confirm("Do you really want to delete the database: " + db + " ?")) {
-		        	self.rpc("/base/session/drop_db", {'db': db, 'password': password}, 
+		        	self.rpc("/base/session/db_operation", {'flag': 'drop', 'db': db, 'password': password}, 
 			        	function(result) {
 			        		self.$option_id.find("select[name=drop_db] :selected").remove();
 			        		self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");