pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: factorize some doAction preprocessing

Browse Source 
This preprocessing also needs to be done in Studio so it's factorized in
a separate function.
This commit is contained in:
Martin Geubelle
2018-02-15 12:39:19 +01:00
parent 3b959c313d
commit 995d08b79a
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/chrome/action_manager.js
+19 -9
View File
@@ -172,20 +172,12 @@ var ActionManager = Widget.extend({
}
return this.dp.add($.when(def)).then(function () {
action.jsID = _.uniqueId('action_');
action.pushState = options.pushState;
// action.target 'main' is equivalent to 'current' except that it
// also clears the breadcrumbs
options.clear_breadcrumbs = action.target === 'main' ||
options.clear_breadcrumbs;
// ensure that the context and domain are evaluated
var context = new Context(self.userContext, options.additional_context, action.context);
action.context = pyeval.eval('context', context);
if (action.domain) {
action.domain = pyeval.eval('domain', action.domain, action.context);
}
self._preprocessAction(action, options);
return self._handleAction(action, options);
});
@@ -757,6 +749,24 @@ var ActionManager = Widget.extend({
});
return def;
},
/**
* Preprocesses the action before it is handled by the ActionManager
* (assigns a JS id, evaluates its context and domains, etc.).
*
* @param {Object} action
* @param {Object} options see @doAction options
*/
_preprocessAction: function (action, options) {
action.jsID = _.uniqueId('action_');
action.pushState = options.pushState;
// ensure that the context and domain are evaluated
var context = new Context(this.userContext, options.additional_context, action.context);
action.context = pyeval.eval('context', context);
if (action.domain) {
action.domain = pyeval.eval('domain', action.domain, action.context);
}
},
/**
* Unlinks the given action and its controller from the internal structures
* and destroys its controllers.