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

[FIX] Fixed spaces instead of tabs. 

bzr revid: noz@tinyerp.com-20110726080318-gu5xvwlepj8o7nmi
This commit is contained in:
noz (OpenERP) 2011-07-26 13:33:18 +05:30
parent c2bbedd32b
commit 01ae186bec
2 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,7 @@ class Database(openerpweb.Controller):
return {"db_list": dbs}
@openerpweb.jsonrequest
def db_operation(self, req, flag, **kw):
if flag == 'create':
def create_db(self, req, **kw):
super_admin_pwd = kw.get('super_admin_pwd')
dbname = kw.get('db')
@ -112,7 +110,8 @@ class Database(openerpweb.Controller):
else:
return {'error': 'Could not create database !', 'title': 'Create Database'}
elif flag == 'drop':
@openerpweb.jsonrequest
def drop_db(self, req, **kw):
db = kw.get('db')
password = kw.get('password')
@ -124,7 +123,8 @@ class Database(openerpweb.Controller):
else:
return {'error': 'Could not drop database !', 'title': 'Drop Database'}
elif flag == 'backup':
@openerpweb.jsonrequest
def backup_db(self, req, **kw):
db = kw.get('db')
password = kw.get('password')
try:
@ -139,7 +139,8 @@ class Database(openerpweb.Controller):
else:
return {'error': 'Could not drop database !', 'title': 'Backup Database'}
elif flag == 'restore':
@openerpweb.jsonrequest
def restore_db(self, req, **kw):
filename = kw.get('filename')
db = kw.get('db')
password = kw.get('password')
@ -153,7 +154,8 @@ class Database(openerpweb.Controller):
else:
return {'error': 'Could not restore database !', 'title': 'Restore Database'}
elif flag == 'change_password':
@openerpweb.jsonrequest
def change_password_db(self, req, **kw):
old_password = kw.get('old_password')
new_password = kw.get('new_password')
confirm_password = kw.get('confirm_password')

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

@ -699,7 +699,6 @@ openerp.base.Database = openerp.base.Controller.extend({
},
start: function() {
this.$element.html(QWeb.render("Database", this));
this.$element.closest(".openerp").removeClass("login-mode");
this.$element.closest(".openerp").addClass("database_block");
@ -756,8 +755,7 @@ openerp.base.Database = openerp.base.Controller.extend({
else
demo_data = 'False';
self.rpc("/base/database/db_operation", {
'flag': 'create',
self.rpc("/base/database/create_db", {
'super_admin_pwd': super_admin_pwd,
'db': db,
'demo_data': demo_data,
@ -798,7 +796,7 @@ openerp.base.Database = openerp.base.Controller.extend({
var password = self.$option_id.find("input[name=drop_pwd]").val();
if (confirm("Do you really want to delete the database: " + db + " ?")) {
self.rpc("/base/database/db_operation", {'flag': 'drop', 'db': db, 'password': password},
self.rpc("/base/database/drop_db", {'db': db, 'password': password},
function(result) {
if (result && ! result.error) {
self.$option_id.find("select[name=drop_db] :selected").remove();
@ -833,7 +831,7 @@ openerp.base.Database = openerp.base.Controller.extend({
var db = self.$option_id.find("select[name=backup_db]").val();
var password = self.$option_id.find("input[name=backup_pwd]").val();
self.rpc("/base/database/db_operation", {'flag': 'backup', 'db': db, 'password': password},
self.rpc("/base/database/backup_db", {'db': db, 'password': password},
function(result) {
if (result && !result.error) {
self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'");
@ -867,7 +865,7 @@ openerp.base.Database = openerp.base.Controller.extend({
var password = self.$option_id.find("input[name=restore_pwd]").val();
var new_db = self.$option_id.find("input[name=new_db]").val();
self.rpc("/base/database/db_operation", {'flag': 'restore', 'db': db, 'password': password, 'new_db': new_db},
self.rpc("/base/database/restore_db", {'db': db, 'password': password, 'new_db': new_db},
function(result) {
if (result && !result.error) {
self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'");
@ -922,7 +920,7 @@ openerp.base.Database = openerp.base.Controller.extend({
var new_pwd = self.$option_id.find("input[name=new_pwd]").val();
var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val();
self.rpc("/base/database/db_operation", {'flag': 'change_password', 'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd},
self.rpc("/base/database/change_password_db", {'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd},
function(result) {
if (result && !result.error) {
self.notification.notify("Changed Password", "Password has been changed successfully");