summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2013-05-27 11:37:38 +0200
committerMartin Trigaux <mat@openerp.com>2013-05-27 11:37:38 +0200
commita51a1fe65ddf5b7d01d32d1db07d29a8ffa8d419 (patch)
tree4465d95ce08c77bea99a50dd0e201cd9cac70112
parentb605ff42426d0704d8e7f24737d99d7abc22ded9 (diff)
[IMP] don't use new action manager for do_action
bzr revid: mat@openerp.com-20130527093738-2dp8uw5nli7xzahu
-rw-r--r--addons/gamification/goal.py3
-rw-r--r--addons/gamification/static/src/js/gamification.js6
2 files changed, 3 insertions, 6 deletions
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 924025da05c..2261f3a5490 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -389,8 +389,7 @@ class gamification_goal(osv.Model):
views = [(view_id, mode)]
break
action['views'] = views
- # doesn't seem to work if not in popup
- action['target'] = 'new'
+
return action
if goal.computation_mode == 'manually':
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 272fa109e78..8c9aff58775 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -29,8 +29,7 @@ openerp.gamification = function(instance) {
goal_action['action'] = res;
});
$.when(goal_action).done(function() {
- var action_manager = new instance.web.ActionManager(this);
- var action = action_manager.do_action(goal_action.action);
+ var action = self.do_action(goal_action.action);
$.when(action).done(function () {
new instance.web.Model('gamification.goal').call('update', [[goal_id]]).then(function(res) {
self.get_goal_todo_info();
@@ -46,8 +45,7 @@ openerp.gamification = function(instance) {
plan_action['action'] = res;
});
$.when(plan_action).done(function() {
- var action_manager = new instance.web.ActionManager(this);
- action_manager.do_action(plan_action.action).done(function () {
+ self.do_action(plan_action.action).done(function () {
self.get_goal_todo_info();
});
});