diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-09 17:11:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-09 17:11:10 +0200 |
| commit | c3d710d2f6c2765919b7bfef5b981ade70df660c (patch) | |
| tree | 04e41b8ebf263be9632335e7703485c18a8df442 /addons/web | |
| parent | 6554d95ed0ee09b58ba01ae3a7a4c2d823c83667 (diff) | |
| parent | 80ac087d6e93578b227cbb034436a0ae8c3c5df4 (diff) | |
[MERGE] forward port branch saas-14 up to 80ac087d6e9
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 12 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index ac388aa0cdc..fcffe8c1ac5 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -665,7 +665,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" % str(e) or repr(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) @@ -676,7 +676,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" % str(e) or repr(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) @@ -686,7 +686,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" % str(e) or repr(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) @@ -704,7 +704,7 @@ class Database(http.Controller): return response except Exception, e: _logger.exception('Database.backup') - error = "Database backup error: %s" % str(e) or repr(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) @@ -714,7 +714,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" % str(e) or repr(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) @@ -723,7 +723,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" % str(e) or repr(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') diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index 096ae4adad6..4f141570902 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -941,7 +941,7 @@ var FormView = View.extend(common.FieldManagerMixin, { var self = this; return this.reload_mutex.exec(function() { if (self.dataset.index === null || self.dataset.index === undefined) { - self.trigger("previous_view"); + self.do_action('reload'); return $.Deferred().reject().promise(); } if (self.dataset.index < 0) { |