diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-06 18:49:36 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-06 18:49:36 +0200 |
| commit | c0e7f9b0b13a4faf55aeeab040c4f63f61a5cfce (patch) | |
| tree | 6a89813ce49f2583758908340883be0ea795c6f7 /addons/web | |
| parent | 1095744e7f058ad370315ef80d56b225376e7b99 (diff) | |
| parent | a85790be5c9f30e556c7401802100db1401cfc5e (diff) | |
[MERGE] forward port branch 10.0 up to a85790be5c9
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index b597c2eea55..11d3801c803 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -662,7 +662,7 @@ class Database(http.Controller): request.session.authenticate(name, post['login'], password) return http.local_redirect('/web/') except Exception, e: - error = "Database creation error: %s" % e + error = "Database creation error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/duplicate', type='http', auth="none", methods=['POST'], csrf=False) @@ -673,7 +673,7 @@ class Database(http.Controller): dispatch_rpc('db', 'duplicate_database', [master_pwd, name, new_name]) return http.local_redirect('/web/database/manager') except Exception, e: - error = "Database duplication error: %s" % e + error = "Database duplication error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/drop', type='http', auth="none", methods=['POST'], csrf=False) @@ -683,7 +683,7 @@ class Database(http.Controller): request._cr = None # dropping a database leads to an unusable cursor return http.local_redirect('/web/database/manager') except Exception, e: - error = "Database deletion error: %s" % e + error = "Database deletion error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/backup', type='http', auth="none", methods=['POST'], csrf=False) @@ -701,7 +701,7 @@ class Database(http.Controller): return response except Exception, e: _logger.exception('Database.backup') - error = "Database backup error: %s" % e + error = "Database backup error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/restore', type='http', auth="none", methods=['POST'], csrf=False) @@ -711,7 +711,7 @@ class Database(http.Controller): dispatch_rpc('db', 'restore', [master_pwd, name, data, str2bool(copy)]) return http.local_redirect('/web/database/manager') except Exception, e: - error = "Database restore error: %s" % e + error = "Database restore error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/change_password', type='http', auth="none", methods=['POST'], csrf=False) @@ -720,7 +720,7 @@ class Database(http.Controller): dispatch_rpc('db', 'change_admin_password', [master_pwd, master_pwd_new]) return http.local_redirect('/web/database/manager') except Exception, e: - error = "Master password update error: %s" % e + error = "Master password update error: %s" % str(e) or repr(e) return self._render_template(error=error) @http.route('/web/database/list', type='json', auth='none') |