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

[FIX] mail: do not put context as feedback when marking an activity as done

Browse Source
This commit is contained in:
Thibault Delavallée
2017-07-12 09:54:00 +02:00
parent cfbbc236ae
commit 9fb86d6fac
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/models/mail_activity.py
+6 -1
View File
@@ -168,7 +168,12 @@ class MailActivity(models.Model):
return super(MailActivity, self).unlink()
@api.multi
def action_done(self, feedback=False):
def action_done(self):
""" Wrapper without feedback because web button add context as
parameter, therefore setting context to feedback """
return self.action_feedback()
def action_feedback(self, feedback=False):
message = self.env['mail.message']
if feedback:
self.write(dict(feedback=feedback))
addons/mail/static/src/js/activity.js
+1 -1
View File
@@ -55,7 +55,7 @@ var AbstractActivityField = AbstractField.extend({
_markActivityDone: function (id, feedback) {
return this._rpc({
model: 'mail.activity',
method: 'action_done',
method: 'action_feedback',
args: [[id]],
kwargs: {feedback: feedback},
});
addons/mail/static/tests/chatter_tests.js
+5 -5
View File
@@ -277,7 +277,7 @@ QUnit.test('kanban activity widget with an activity', function (assert) {
'</kanban>',
mockRPC: function (route, args) {
rpcCount++;
if (route === '/web/dataset/call_kw/mail.activity/action_done') {
if (route === '/web/dataset/call_kw/mail.activity/action_feedback') {
var current_ids = this.data.partner.records[0].activity_ids;
var done_ids = args.args[0];
this.data.partner.records[0].activity_ids = _.difference(current_ids, done_ids);
@@ -521,8 +521,8 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
'</form>',
res_id: 2,
mockRPC: function (route, args) {
if (route === '/web/dataset/call_kw/mail.activity/action_done') {
assert.ok(_.isEqual(args.args[0], [1]), "should call 'action_done' for id 1");
if (route === '/web/dataset/call_kw/mail.activity/action_feedback') {
assert.ok(_.isEqual(args.args[0], [1]), "should call 'action_feedback' for id 1");
assert.strictEqual(args.kwargs.feedback, 'everything is ok',
"the feedback should be sent correctly");
return $.when();
@@ -607,8 +607,8 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
mockRPC: function (route, args) {
if (route === '/web/dataset/call_kw/mail.activity/unlink') {
assert.ok(_.isEqual(args.args[0], [1]), "should call 'unlink' for id 1");
} else if (route === '/web/dataset/call_kw/mail.activity/action_done') {
assert.ok(_.isEqual(args.args[0], [2]), "should call 'action_done' for id 2");
} else if (route === '/web/dataset/call_kw/mail.activity/action_feedback') {
assert.ok(_.isEqual(args.args[0], [2]), "should call 'action_feedback' for id 2");
assert.strictEqual(args.kwargs.feedback, 'everything is ok',
"the feedback should be sent correctly");
// should generate a message and unlink the activity