odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove redundant 'db' qualifiers in Database methods and JSON-RPC methods 

bzr revid: xmo@openerp.com-20110802091849-6jobmumdqw4o6j68
This commit is contained in:
Xavier Morel 2011-08-02 11:18:49 +02:00
parent 21aab96e41
commit 808a015933
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/base/controllers/main.py
View File

@ -154,7 +154,7 @@ class Database(openerpweb.Controller):
_cp_path = "/base/database"
@openerpweb.jsonrequest
def get_databases_list(self, req):
def get_list(self, req):
proxy = req.session.proxy("db")
dbs = proxy.list()
h = req.httprequest.headers['Host'].split(':')[0]
@ -168,7 +168,7 @@ class Database(openerpweb.Controller):
return req.session.proxy('db').get_progress(password, id)
@openerpweb.jsonrequest
def create_db(self, req, fields):
def create(self, req, fields):
params = dict(map(operator.itemgetter('name', 'value'), fields))
create_attrs = operator.itemgetter(
@ -183,7 +183,7 @@ class Database(openerpweb.Controller):
return {'error': 'Could not create database !', 'title': 'Create Database'}
@openerpweb.jsonrequest
def drop_db(self, req, fields):
def drop(self, req, fields):
password, db = operator.itemgetter(
'drop_pwd', 'drop_db')(
dict(map(operator.itemgetter('name', 'value'), fields)))
@ -196,7 +196,7 @@ class Database(openerpweb.Controller):
return {'error': 'Could not drop database !', 'title': 'Drop Database'}
@openerpweb.httprequest
def backup_db(self, req, backup_db, backup_pwd, token):
def backup(self, req, backup_db, backup_pwd, token):
try:
db_dump = base64.decodestring(
req.session.proxy("db").dump(backup_pwd, backup_db))
@ -211,7 +211,7 @@ class Database(openerpweb.Controller):
return {'error': 'Could not drop database !', 'title': 'Backup Database'}
@openerpweb.httprequest
def restore_db(self, req, db_file, restore_pwd, new_db):
def restore(self, req, db_file, restore_pwd, new_db):
try:
data = base64.encodestring(db_file.file.read())
req.session.proxy("db").restore(restore_pwd, new_db, data)
@ -223,7 +223,7 @@ class Database(openerpweb.Controller):
raise cherrypy.HTTPError()
@openerpweb.jsonrequest
def change_password_db(self, req, fields):
def change_password(self, req, fields):
old_password, new_password = operator.itemgetter(
'old_pwd', 'new_pwd')(
dict(map(operator.itemgetter('name', 'value'), fields)))

30
addons/base/static/src/js/chrome.js
View File

@ -682,7 +682,7 @@ openerp.base.Database = openerp.base.Controller.extend({
var self = this;
var fetch_db = this.rpc("/base/database/get_databases_list", {}, function(result) {
var fetch_db = this.rpc("/base/database/get_list", {}, function(result) {
self.db_list = result.db_list;
});
var fetch_langs = this.rpc("/base/session/get_lang_list", {}, function(result) {
@ -700,12 +700,12 @@ openerp.base.Database = openerp.base.Controller.extend({
}).html(result.error);
}
});
$.when(fetch_db, fetch_langs).then(function () {self.do_db_create();});
$.when(fetch_db, fetch_langs).then(function () {self.do_create();});
this.$element.find('#db-create').click(this.do_db_create);
this.$element.find('#db-drop').click(this.do_db_drop);
this.$element.find('#db-backup').click(this.do_db_backup);
this.$element.find('#db-restore').click(this.do_db_restore);
this.$element.find('#db-create').click(this.do_create);
this.$element.find('#db-drop').click(this.do_drop);
this.$element.find('#db-backup').click(this.do_backup);
this.$element.find('#db-restore').click(this.do_restore);
this.$element.find('#db-change-password').click(this.do_change_password);
this.$element.find('#back-to-login').click(function() {
self.stop();
@ -795,7 +795,7 @@ openerp.base.Database = openerp.base.Controller.extend({
}
}).html(error.error);
},
do_db_create: function() {
do_create: function() {
var self = this;
self.$option_id.html(QWeb.render("CreateDB", self));
@ -803,7 +803,7 @@ openerp.base.Database = openerp.base.Controller.extend({
submitHandler: function (form) {
var fields = $(form).serializeArray();
$.blockUI();
self.rpc("/base/database/create_db", {'fields': fields}, function(result) {
self.rpc("/base/database/create", {'fields': fields}, function(result) {
if (result.error) {
$.unblockUI();
self.display_error(result);
@ -821,7 +821,7 @@ openerp.base.Database = openerp.base.Controller.extend({
});
},
do_db_drop: function() {
do_drop: function() {
var self = this;
self.$option_id.html(QWeb.render("DropDB", self));
@ -835,7 +835,7 @@ openerp.base.Database = openerp.base.Controller.extend({
if (!confirm("Do you really want to delete the database: " + db + " ?")) {
return;
}
self.rpc("/base/database/drop_db", {'fields': fields}, function(result) {
self.rpc("/base/database/drop", {'fields': fields}, function(result) {
if (result.error) {
self.display_error(result);
return;
@ -869,7 +869,7 @@ openerp.base.Database = openerp.base.Controller.extend({
}
}, 100);
},
do_db_backup: function() {
do_backup: function() {
var self = this;
self.$option_id.html(QWeb.render("BackupDB", self));
@ -897,7 +897,7 @@ openerp.base.Database = openerp.base.Controller.extend({
});
},
do_db_restore: function() {
do_restore: function() {
var self = this;
self.$option_id.html(QWeb.render("RestoreDB", self));
@ -905,7 +905,7 @@ openerp.base.Database = openerp.base.Controller.extend({
submitHandler: function (form) {
$.blockUI();
$(form).ajaxSubmit({
url: '/base/database/restore_db',
url: '/base/database/restore',
type: 'POST',
resetForm: true,
success: function (body) {
@ -950,7 +950,7 @@ openerp.base.Database = openerp.base.Controller.extend({
}
},
submitHandler: function (form) {
self.rpc("/base/database/change_password_db", {
self.rpc("/base/database/change_password", {
'fields': $(form).serializeArray()
}, function(result) {
if (result.error) {
@ -988,7 +988,7 @@ openerp.base.Login = openerp.base.Controller.extend({
},
start: function() {
var self = this;
this.rpc("/base/database/get_databases_list", {}, function(result) {
this.rpc("/base/database/get_list", {}, function(result) {
self.db_list = result.db_list;
self.display();
}, function() {

2
addons/base/static/src/xml/base.xml
View File

@ -150,7 +150,7 @@
</t>
<t t-name="BackupDB">
<form name="backup_db_form" method="POST" target="backup-target"
action="/base/database/backup_db">
action="/base/database/backup">
<input type="hidden" name="token"/>
<table width="100%">
<tr>

4
addons/web_mobile/static/src/js/chrome_mobile.js
View File

@ -129,7 +129,7 @@ openerp.web_mobile.Login = openerp.base.Controller.extend({
var self = this;
jQuery("#oe_header").children().remove();
this.rpc("/base/session/get_databases_list", {}, function(result) {
this.rpc("/base/database/get_list", {}, function(result) {
self.db_list = result.db_list;
self.$element.html(QWeb.render("Login", self));
self.$element.find('#database').click(self.on_db_select);
@ -214,4 +214,4 @@ openerp.web_mobile.mobilewebclient = function(element_id) {
client.start();
return client;
};
}
}