1 files changed, 15 insertions, 34 deletions

diff --git a/addons/mail/static/src/js/views/activity/activity_controller.js b/addons/mail/static/src/js/views/activity/activity_controller.js
index 6af4c310c01..4ed543dd3ec 100644
--- a/addons/mail/static/src/js/views/activity/activity_controller.js
+++ b/addons/mail/static/src/js/views/activity/activity_controller.js
@@ -1,34 +1,30 @@
 odoo.define('mail.ActivityController', function (require) {
 "use strict";
 
-var AbstractController = require('web.AbstractController');
+var BasicController = require('web.BasicController');
 
-var ActivityController = AbstractController.extend({
-    custom_events: _.extend({}, AbstractController.prototype.custom_events, {
+var ActivityController = BasicController.extend({
+    custom_events: _.extend({}, BasicController.prototype.custom_events, {
         send_mail_template: '_onSendMailTemplate',
-        open_view_form: '_onOpenViewForm',
-        reload: '_onReload',
     }),
 
     //--------------------------------------------------------------------------
-    // Handlers
+    // Public
     //--------------------------------------------------------------------------
 
     /**
-     * @private
-     * @param {OdooEvent} event
-     * @param {string} event.name
-     * @param {Object} event.data
-     * @param {boolean} [event.data.activity]
-     * @param {boolean} [event.data.followers]
-     * @param {boolean} [event.data.thread]
+     * Overridden to remove the pager as it makes no sense in this view.
+     *
+     * @override
      */
-    _onReload: function (event) {
-        event.stopPropagation();
-        var self = this;
-        this.model.reload().then(self.reload());
+    renderPager: function () {
+        return Promise.resolve();
     },
 
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
     /**
      * @private
      * @param {OdooEvent} ev
@@ -36,8 +32,8 @@ var ActivityController = AbstractController.extend({
     _onSendMailTemplate: function (ev) {
         var templateID = ev.data.templateID;
         var activityTypeID = ev.data.activityTypeID;
-        var state = this.model.get();
-        var groupedActivities = state.data.grouped_activities;
+        var state = this.model.get(this.handle);
+        var groupedActivities = state.grouped_activities;
         var resIDS = [];
         Object.keys(groupedActivities).forEach(function (resID) {
             var activityByType = groupedActivities[resID];
@@ -52,21 +48,6 @@ var ActivityController = AbstractController.extend({
             args: [resIDS, templateID],
         });
     },
-    /**
-    * @private
-    * @override
-    * @param {MouseEvent} ev
-    */
-    _onOpenViewForm: function (ev) {
-        var resID = ev.data.resID;
-        this.do_action({
-            type: 'ir.actions.act_window',
-            res_model: this.model.modelName,
-            res_id: resID,
-            views: [[false, 'form']],
-            target: 'current'
-        });
-    },
 });
 
 return ActivityController;