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

[IMP] web: database manager: restore copy database 

bzr revid: chs@openerp.com-20140305124444-1jzxmffrm7502t4e
This commit is contained in:
Christophe Simonis 2014-03-05 13:44:44 +01:00
parent e76c36d704
commit 5d95027f0a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/controllers/main.py
View File

@ -930,10 +930,11 @@ class Database(http.Controller):
return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
@http.route('/web/database/restore', type='http', auth="none")
def restore(self, db_file, restore_pwd, new_db):
def restore(self, db_file, restore_pwd, new_db, mode):
try:
copy = mode == 'copy'
data = base64.b64encode(db_file.read())
request.session.proxy("db").restore(restore_pwd, new_db, data)
request.session.proxy("db").restore(restore_pwd, new_db, data, copy)
return ''
except openerp.exceptions.AccessDenied, e:
raise Exception("AccessDenied")

15
addons/web/static/src/xml/base.xml
View File

@ -231,17 +231,24 @@
</div>
<table align="center" class="db_option_table">
<tr>
<td><label for="restore_db">File:</label></td>
<td><input type="file" name="db_file" class="required" autofocus="autofocus"/></td>
<td><label for="restore_pwd">Master Password:</label></td>
<td><input type="password" name="restore_pwd" class="required" autofocus="autofocus"/></td>
</tr>
<tr>
<td><label for="restore_pwd">Master Password:</label></td>
<td><input type="password" name="restore_pwd" class="required"/></td>
<td><label for="restore_db">File:</label></td>
<td><input type="file" name="db_file" class="required"/></td>
</tr>
<tr>
<td><label for="new_db">New database name:</label></td>
<td><input type="text" name="new_db" class="required"/></td>
</tr>
<tr>
<td><label for="mode">Mode:</label></td>
<td><select name="mode" class="required">
<option value="restore">Backup Restore</option>
<option value="copy">Copy of an existing database</option>
</select></td>
</tr>
</table>
</form>
<form id="db_change_password" name="change_pwd_form" style="display: none;">