[FIX] Created common method for all Database operations.
bzr revid: noz@tinyerp.com-20110701122430-lhomemgtfay5jeev
This commit is contained in:
@@ -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):
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user