diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-26 14:04:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-26 14:04:04 +0200 |
| commit | e1c74e374c58dde38963fb61b6d46cb438cc95e0 (patch) | |
| tree | e70dd9e9d08c90367aab57498bdef538134649b1 /addons/web/static/src | |
| parent | 59afea4c8293bd6cdc257db0676d9b70d193476e (diff) | |
| parent | 3bac72ba74163a1ad9d5862f96e7de817aa08918 (diff) | |
[MERGE] forward port branch saas-14 up to 3bac72ba741
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/debug_manager.js | 11 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 5ae64da9bfb..aa60c2792a6 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -519,13 +519,11 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext }).open(); }, openDomainDialog: function () { - new DomainSelectorDialog(this, this.model, this.get("value") || "[]", { + return new DomainSelectorDialog(this, this.model, this.get("value") || "[]", { readonly: this.get("effective_readonly"), fs_filters: this.options.fs_filters, debugMode: session.debug, }).open(); - this.trigger("dialog_opened", dialog); - return dialog; }, }); diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js index 1ae85c6f7d1..627c477c92e 100644 --- a/addons/web/static/src/js/widgets/debug_manager.js +++ b/addons/web/static/src/js/widgets/debug_manager.js @@ -250,17 +250,6 @@ DebugManager.include({ } }); }, - edit_workflow: function () { - return this.do_action({ - res_model: 'workflow', - name: _t('Edit Workflow'), - domain: [['osv', '=', this._action.res_model]], - views: [[false, 'list'], [false, 'form'], [false, 'diagram']], - type: 'ir.actions.act_window', - view_type: 'list', - view_mode: 'list' - }); - }, translate: function() { var model = this._action.res_model; new Model("ir.translation") diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b646d1b2ac2..d76dd44f469 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -128,7 +128,6 @@ <t t-if="action.res_model"> <li><a href="#" data-action="get_view_fields">View Fields</a></li> <li><a href="#" data-action="manage_filters">Manage Filters</a></li> - <li t-if="manager._is_admin"><a href="#" data-action="edit_workflow">Edit Workflow</a></li> <li><a href="#" data-action="translate">Technical Translation</a></li> </t> </t> |