diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-06 19:23:03 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-06 19:23:03 +0200 |
| commit | 6f3eada2c3a5c0a21c9b3fef3bef3f655b0892e4 (patch) | |
| tree | 82d444e6c02f7cb18f41dba24a045ad16d0cd4a4 /addons/web/controllers | |
| parent | 7095cb5af5ddef5e89e2bc1da8add6bfff1ed10e (diff) | |
| parent | f687a27b79e2072ffe0de11722fa8ab1f7c9a6fd (diff) | |
[MERGE] forward port branch saas-15 up to f687a27b79e
Diffstat (limited to 'addons/web/controllers')
| -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 30a4f24c2a6..2cd2c2ac7da 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -680,7 +680,7 @@ class Database(http.Controller): request.session.authenticate(name, post['login'], password) return http.local_redirect('/web/') except Exception as 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) @@ -691,7 +691,7 @@ class Database(http.Controller): dispatch_rpc('db', 'duplicate_database', [master_pwd, name, new_name]) return http.local_redirect('/web/database/manager') except Exception as 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) @@ -701,7 +701,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 as 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) @@ -719,7 +719,7 @@ class Database(http.Controller): return response except Exception as 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) @@ -729,7 +729,7 @@ class Database(http.Controller): dispatch_rpc('db', 'restore', [master_pwd, name, data, str2bool(copy)]) return http.local_redirect('/web/database/manager') except Exception as 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) @@ -738,7 +738,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 as 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') |