From 8d3f2749e429dbcddcceeac50e1667501e808f3c Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 27 Jun 2018 14:39:47 +0200
Subject: [PATCH 1/5] web_notify: add feature to reload current view

---
 web_notify/README.rst                       | 10 +++++
 web_notify/__manifest__.py                  |  5 ++-
 web_notify/models/res_users.py              | 17 +++++---
 web_notify/static/src/css/notification.less |  5 +++
 web_notify/static/src/js/notification.js    | 40 ++++++++++++++++++
 web_notify/static/src/js/web_client.js      | 47 +++++++++++++++++++--
 web_notify/static/src/xml/notification.xml  | 24 +++++++++++
 web_notify/views/web_notify.xml             |  2 +
 8 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 web_notify/static/src/css/notification.less
 create mode 100644 web_notify/static/src/js/notification.js
 create mode 100644 web_notify/static/src/xml/notification.xml

diff --git a/web_notify/README.rst b/web_notify/README.rst
index 2fa24871..0d95e255 100644
--- a/web_notify/README.rst
+++ b/web_notify/README.rst
@@ -30,6 +30,16 @@ or
    :scale: 80 %
    :alt: Sample notifications
 
+The notifications can optionally have some action buttons.
+
+* One allowing to refresh the active view
+
+It is activated when sending the notification with:
+
+.. code-block:: python
+  
+   self.env.user.notify_info('My information message', show_reload=True)
+
 Installation
 ============
 
diff --git a/web_notify/__manifest__.py b/web_notify/__manifest__.py
index 858c3be9..c84ae279 100644
--- a/web_notify/__manifest__.py
+++ b/web_notify/__manifest__.py
@@ -6,7 +6,7 @@
     'name': 'Web Notify',
     'summary': """
         Send notification messages to user""",
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'description': 'Web Notify',
     'license': 'AGPL-3',
     'author': 'ACSONE SA/NV,Odoo Community Association (OCA)',
@@ -18,7 +18,8 @@
     'data': [
         'views/web_notify.xml'
     ],
-    'demo': [
+    'qweb': [
+        'static/src/xml/*.xml',
     ],
     'installable': True,
 }
diff --git a/web_notify/models/res_users.py b/web_notify/models/res_users.py
index 29f0eca1..30165f17 100644
--- a/web_notify/models/res_users.py
+++ b/web_notify/models/res_users.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 ACSONE SA/NV
+# Copyright 2018 Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models, _
@@ -23,23 +24,27 @@ class ResUsers(models.Model):
         compute='_compute_channel_names')
 
     @api.multi
-    def notify_info(self, message, title=None, sticky=False):
+    def notify_info(self, message, title=None, sticky=False,
+                    show_reload=False):
         title = title or _('Information')
         self._notify_channel(
-            'notify_info_channel_name', message, title, sticky)
+            'notify_info_channel_name', message, title, sticky, show_reload)
 
     @api.multi
-    def notify_warning(self, message, title=None, sticky=False):
+    def notify_warning(self, message, title=None, sticky=False,
+                       show_reload=False):
         title = title or _('Warning')
         self._notify_channel(
-            'notify_warning_channel_name', message, title, sticky)
+            'notify_warning_channel_name', message, title, sticky, show_reload)
 
     @api.multi
-    def _notify_channel(self, channel_name_field, message, title, sticky):
+    def _notify_channel(self, channel_name_field, message, title, sticky,
+                        show_reload):
         bus_message = {
             'message': message,
             'title': title,
-            'sticky': sticky
+            'sticky': sticky,
+            'show_reload': show_reload,
         }
         notifications = [(getattr(record, channel_name_field), bus_message)
                          for record in self]
diff --git a/web_notify/static/src/css/notification.less b/web_notify/static/src/css/notification.less
new file mode 100644
index 00000000..1f1ee9a6
--- /dev/null
+++ b/web_notify/static/src/css/notification.less
@@ -0,0 +1,5 @@
+.o_notification {
+    .o_notification_reload {
+        padding: 10px;
+    }
+}
diff --git a/web_notify/static/src/js/notification.js b/web_notify/static/src/js/notification.js
new file mode 100644
index 00000000..383b1d3e
--- /dev/null
+++ b/web_notify/static/src/js/notification.js
@@ -0,0 +1,40 @@
+/* Copyright 2018 Camptocamp
+ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+odoo.define('web_notify.notification', function (require) {
+    "use strict";
+
+    var base_notification = require('web.notification'),
+        WebClient = require('web.WebClient'),
+        Notification = base_notification.Notification,
+        Warning = base_notification.Warning;
+
+    Notification.include({
+        events: _.extend(
+            {},
+            Notification.prototype.events,
+            {'click .o_view_reload': function(e){
+                e.preventDefault();
+                this.reload_active_view();
+            }
+            }
+        ),
+        init: function(parent, title, text, sticky, options) {
+            this._super.apply(this, arguments);
+            this.options = options || {};
+        },
+        reload_active_view: function() {
+            this.trigger_up('reload_active_view');
+        },
+    });
+
+    base_notification.NotificationManager.include({
+        notify: function(title, text, sticky, options) {
+            return this.display(new Notification(this, title, text, sticky, options));
+        },
+        warn: function(title, text, sticky, options) {
+            return this.display(new Warning(this, title, text, sticky, options));
+        },
+
+    });
+
+});
diff --git a/web_notify/static/src/js/web_client.js b/web_notify/static/src/js/web_client.js
index 1ee99224..6fceb35b 100644
--- a/web_notify/static/src/js/web_client.js
+++ b/web_notify/static/src/js/web_client.js
@@ -1,13 +1,52 @@
 odoo.define('web_notify.WebClient', function (require) {
 "use strict";
 
-var WebClient = require('web.WebClient');
-var base_bus = require('bus.bus');
+var core = require('web.core'),
+    WebClient = require('web.WebClient'),
+    base_bus = require('bus.bus'),
+    Widget = require('web.Widget');
+
+
+Widget.include({
+    do_notify: function(title, message, sticky, options) {
+        this.trigger_up('notification', {title: title, message: message, sticky: sticky, options: options});
+    },
+    do_warn: function(title, message, sticky, options) {
+        this.trigger_up('warning', {title: title, message: message, sticky: sticky, options: options});
+    },
+});
+
 
 WebClient.include({
+    custom_events: _.extend(
+        {},
+        WebClient.prototype.custom_events,
+        {reload_active_view: 'reload_active_view',
+         notification: function (e) {
+             if(this.notification_manager) {
+                 this.notification_manager.notify(e.data.title, e.data.message, e.data.sticky, e.data.options);
+             }
+         },
+         warning: function (e) {
+             if(this.notification_manager) {
+                 this.notification_manager.warn(e.data.title, e.data.message, e.data.sticky, e.data.options);
+             }
+         }
+        }
+    ),
     init: function(parent, client_options){
         this._super(parent, client_options);
     },
+    reload_active_view: function(){
+        var action_manager = this.action_manager;
+        if(!action_manager){
+            return;
+        }
+        var active_view = action_manager.inner_widget.active_view;
+        if(active_view) {
+            active_view.controller.reload();
+        }
+    },
     show_application: function() {
         var res = this._super();
         this.start_polling();
@@ -40,12 +79,12 @@ WebClient.include({
     },
     on_message_warning: function(message){
         if(this.notification_manager) {
-            this.notification_manager.do_warn(message.title, message.message, message.sticky);
+            this.notification_manager.do_warn(message.title, message.message, message.sticky, message);
         }
     },
     on_message_info: function(message){
         if(this.notification_manager) {
-            this.notification_manager.do_notify(message.title, message.message, message.sticky);
+            this.notification_manager.do_notify(message.title, message.message, message.sticky, message);
         }
     }
 });
diff --git a/web_notify/static/src/xml/notification.xml b/web_notify/static/src/xml/notification.xml
new file mode 100644
index 00000000..d73fb6f5
--- /dev/null
+++ b/web_notify/static/src/xml/notification.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+<t t-name="Notification.reload">
+    <div class="o_notification_reload" t-if="widget.options.show_reload">
+        <a href="#" class="o_view_reload">
+            <span class="fa fa-refresh"/> Reload current view
+        </a>
+    </div>
+</t>
+
+<t t-extend="Notification">
+    <t t-jquery=".o_notification_content" t-operation="after">
+        <t t-call="Notification.reload"/>
+    </t>
+</t>
+
+<t t-extend="Warning">
+    <t t-jquery=".o_notification_content" t-operation="after">
+        <t t-call="Notification.reload"/>
+    </t>
+</t>
+
+</templates>
diff --git a/web_notify/views/web_notify.xml b/web_notify/views/web_notify.xml
index b85d2e6f..4d009595 100644
--- a/web_notify/views/web_notify.xml
+++ b/web_notify/views/web_notify.xml
@@ -3,7 +3,9 @@
     <data>
         <template id="assets_backend" name="web_noify assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/web_notify/static/src/css/notification.less"/>
                 <script type="text/javascript" src="/web_notify/static/src/js/web_client.js"/>
+                <script type="text/javascript" src="/web_notify/static/src/js/notification.js"/>
             </xpath>
         </template>
     </data>

From b333cdc7b1f0b533448597da626a78406be53637 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 27 Jun 2018 15:52:14 +0200
Subject: [PATCH 2/5] Add possibility to return an action in a notification

---
 web_notify/README.rst                       | 18 ++++++++++++++++--
 web_notify/models/res_users.py              | 16 +++++++++++-----
 web_notify/static/src/css/notification.less |  2 +-
 web_notify/static/src/js/notification.js    | 12 ++++++++++--
 web_notify/static/src/xml/notification.xml  | 14 ++++++++++++--
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/web_notify/README.rst b/web_notify/README.rst
index 0d95e255..bff70210 100644
--- a/web_notify/README.rst
+++ b/web_notify/README.rst
@@ -30,16 +30,29 @@ or
    :scale: 80 %
    :alt: Sample notifications
 
-The notifications can optionally have some action buttons.
+The notifications can bring interactivity with some buttons.
 
 * One allowing to refresh the active view
+* Another allowing to send a window / client action
 
-It is activated when sending the notification with:
+The reload button is activated when sending the notification with:
 
 .. code-block:: python
   
    self.env.user.notify_info('My information message', show_reload=True)
 
+The action can be used using the ``action`` keyword:
+
+.. code-block:: python
+
+    action = self.env.ref('sale.action_orders').read()[0]
+    action.update({
+        'res_id': self.id,
+        'views': [(False, 'form')],
+    })
+   self.env.user.notify_info('My information message', action=action)
+
+
 Installation
 ============
 
@@ -74,6 +87,7 @@ Contributors
 
 * Laurent Mignon <laurent.mignon@acsone.eu>
 * Serpent Consulting Services Pvt. Ltd.<jay.vora@serpentcs.com>
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
 
 Maintainer
 ----------
diff --git a/web_notify/models/res_users.py b/web_notify/models/res_users.py
index 30165f17..56cca763 100644
--- a/web_notify/models/res_users.py
+++ b/web_notify/models/res_users.py
@@ -4,6 +4,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models, _
+from odoo.addons.web.controllers.main import clean_action
 
 
 class ResUsers(models.Model):
@@ -25,26 +26,31 @@ class ResUsers(models.Model):
 
     @api.multi
     def notify_info(self, message, title=None, sticky=False,
-                    show_reload=False):
+                    show_reload=False, action=None):
         title = title or _('Information')
         self._notify_channel(
-            'notify_info_channel_name', message, title, sticky, show_reload)
+            'notify_info_channel_name', message, title,
+            sticky, show_reload, action)
 
     @api.multi
     def notify_warning(self, message, title=None, sticky=False,
-                       show_reload=False):
+                       show_reload=False, action=None):
         title = title or _('Warning')
         self._notify_channel(
-            'notify_warning_channel_name', message, title, sticky, show_reload)
+            'notify_warning_channel_name', message, title,
+            sticky, show_reload, action)
 
     @api.multi
     def _notify_channel(self, channel_name_field, message, title, sticky,
-                        show_reload):
+                        show_reload, action):
+        if action:
+            action = clean_action(action)
         bus_message = {
             'message': message,
             'title': title,
             'sticky': sticky,
             'show_reload': show_reload,
+            'action': action,
         }
         notifications = [(getattr(record, channel_name_field), bus_message)
                          for record in self]
diff --git a/web_notify/static/src/css/notification.less b/web_notify/static/src/css/notification.less
index 1f1ee9a6..d5744132 100644
--- a/web_notify/static/src/css/notification.less
+++ b/web_notify/static/src/css/notification.less
@@ -1,5 +1,5 @@
 .o_notification {
-    .o_notification_reload {
+    .o_notification_action {
         padding: 10px;
     }
 }
diff --git a/web_notify/static/src/js/notification.js b/web_notify/static/src/js/notification.js
index 383b1d3e..ad305089 100644
--- a/web_notify/static/src/js/notification.js
+++ b/web_notify/static/src/js/notification.js
@@ -12,10 +12,14 @@ odoo.define('web_notify.notification', function (require) {
         events: _.extend(
             {},
             Notification.prototype.events,
-            {'click .o_view_reload': function(e){
+            {'click .o_notification_reload_view': function(e){
                 e.preventDefault();
                 this.reload_active_view();
-            }
+            },
+             'click .o_notification_do_action': function(e){
+                 e.preventDefault();
+                 this.button_do_action();
+             }
             }
         ),
         init: function(parent, title, text, sticky, options) {
@@ -25,6 +29,10 @@ odoo.define('web_notify.notification', function (require) {
         reload_active_view: function() {
             this.trigger_up('reload_active_view');
         },
+        button_do_action: function() {
+            console.log(this.options.action);
+            this.getParent().do_action(this.options.action);
+        }
     });
 
     base_notification.NotificationManager.include({
diff --git a/web_notify/static/src/xml/notification.xml b/web_notify/static/src/xml/notification.xml
index d73fb6f5..aa3df543 100644
--- a/web_notify/static/src/xml/notification.xml
+++ b/web_notify/static/src/xml/notification.xml
@@ -2,22 +2,32 @@
 <templates id="template" xml:space="preserve">
 
 <t t-name="Notification.reload">
-    <div class="o_notification_reload" t-if="widget.options.show_reload">
-        <a href="#" class="o_view_reload">
+    <div class="o_notification_action" t-if="widget.options.show_reload">
+        <a href="#" class="o_notification_reload_view">
             <span class="fa fa-refresh"/> Reload current view
         </a>
     </div>
 </t>
 
+<t t-name="Notification.do_action">
+    <div class="o_notification_action" t-if="widget.options.action">
+        <a href="#" class="o_notification_do_action">
+            <span class="fa fa-arrow-circle-left"/> Open
+        </a>
+    </div>
+</t>
+
 <t t-extend="Notification">
     <t t-jquery=".o_notification_content" t-operation="after">
         <t t-call="Notification.reload"/>
+        <t t-call="Notification.do_action"/>
     </t>
 </t>
 
 <t t-extend="Warning">
     <t t-jquery=".o_notification_content" t-operation="after">
         <t t-call="Notification.reload"/>
+        <t t-call="Notification.do_action"/>
     </t>
 </t>
 

From bf7fda198090aefc02b91cde20ba0f79c858776b Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 27 Jun 2018 22:12:51 +0200
Subject: [PATCH 3/5] Use new classes for the interactive notifications

---
 web_notify/static/src/js/notification.js   | 24 ++++++++++-----
 web_notify/static/src/js/web_client.js     | 36 ++++++++++++++++------
 web_notify/static/src/xml/notification.xml |  4 +--
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/web_notify/static/src/js/notification.js b/web_notify/static/src/js/notification.js
index ad305089..e4cb27ba 100644
--- a/web_notify/static/src/js/notification.js
+++ b/web_notify/static/src/js/notification.js
@@ -8,7 +8,8 @@ odoo.define('web_notify.notification', function (require) {
         Notification = base_notification.Notification,
         Warning = base_notification.Warning;
 
-    Notification.include({
+    var InteractiveNotification = Notification.extend({
+        template: 'InteractiveNotification',
         events: _.extend(
             {},
             Notification.prototype.events,
@@ -23,7 +24,7 @@ odoo.define('web_notify.notification', function (require) {
             }
         ),
         init: function(parent, title, text, sticky, options) {
-            this._super.apply(this, arguments);
+            this._super.apply(this, [parent, title, text, sticky]);
             this.options = options || {};
         },
         reload_active_view: function() {
@@ -35,14 +36,23 @@ odoo.define('web_notify.notification', function (require) {
         }
     });
 
+    var InteractiveWarning = InteractiveNotification.extend({
+        template: 'InteractiveWarning',
+    });
+
     base_notification.NotificationManager.include({
-        notify: function(title, text, sticky, options) {
-            return this.display(new Notification(this, title, text, sticky, options));
-        },
-        warn: function(title, text, sticky, options) {
-            return this.display(new Warning(this, title, text, sticky, options));
+        interactive_notify(title, text, sticky, options) {
+            return this.display(new InteractiveNotification(this, title, text, sticky, options));
         },
+        interactive_warn(title, text, sticky, options) {
+            return this.display(new InteractiveWarning(this, title, text, sticky, options));
+        }
 
     });
 
+    return {
+        InteractiveNotification: InteractiveNotification,
+        InteractiveWarning: InteractiveWarning
+    };
+
 });
diff --git a/web_notify/static/src/js/web_client.js b/web_notify/static/src/js/web_client.js
index 6fceb35b..d7309726 100644
--- a/web_notify/static/src/js/web_client.js
+++ b/web_notify/static/src/js/web_client.js
@@ -8,11 +8,17 @@ var core = require('web.core'),
 
 
 Widget.include({
-    do_notify: function(title, message, sticky, options) {
-        this.trigger_up('notification', {title: title, message: message, sticky: sticky, options: options});
+    do_interactive_notify: function(title, message, sticky, options) {
+        this.trigger_up(
+            'interactive_notification',
+            {title: title, message: message,
+             sticky: sticky, options: options});
     },
-    do_warn: function(title, message, sticky, options) {
-        this.trigger_up('warning', {title: title, message: message, sticky: sticky, options: options});
+    do_interactive_warn: function(title, message, sticky, options) {
+        this.trigger_up(
+            'interactive_warning',
+            {title: title, message: message,
+             sticky: sticky, options: options});
     },
 });
 
@@ -22,14 +28,20 @@ WebClient.include({
         {},
         WebClient.prototype.custom_events,
         {reload_active_view: 'reload_active_view',
-         notification: function (e) {
+         interactive_notification: function (e) {
              if(this.notification_manager) {
-                 this.notification_manager.notify(e.data.title, e.data.message, e.data.sticky, e.data.options);
+                 this.notification_manager.interactive_notify(
+                     e.data.title, e.data.message,
+                     e.data.sticky, e.data.options
+                 );
              }
          },
-         warning: function (e) {
+         interactive_warning: function (e) {
              if(this.notification_manager) {
-                 this.notification_manager.warn(e.data.title, e.data.message, e.data.sticky, e.data.options);
+                 this.notification_manager.interactive_warn(
+                     e.data.title, e.data.message,
+                     e.data.sticky, e.data.options
+                 );
              }
          }
         }
@@ -79,12 +91,16 @@ WebClient.include({
     },
     on_message_warning: function(message){
         if(this.notification_manager) {
-            this.notification_manager.do_warn(message.title, message.message, message.sticky, message);
+            this.notification_manager.do_interactive_warn(
+                message.title, message.message, message.sticky, message
+            );
         }
     },
     on_message_info: function(message){
         if(this.notification_manager) {
-            this.notification_manager.do_notify(message.title, message.message, message.sticky, message);
+            this.notification_manager.do_interactive_notify(
+                message.title, message.message, message.sticky, message
+            );
         }
     }
 });
diff --git a/web_notify/static/src/xml/notification.xml b/web_notify/static/src/xml/notification.xml
index aa3df543..f620fa5c 100644
--- a/web_notify/static/src/xml/notification.xml
+++ b/web_notify/static/src/xml/notification.xml
@@ -17,14 +17,14 @@
     </div>
 </t>
 
-<t t-extend="Notification">
+<t t-name="InteractiveNotification" t-extend="Notification">
     <t t-jquery=".o_notification_content" t-operation="after">
         <t t-call="Notification.reload"/>
         <t t-call="Notification.do_action"/>
     </t>
 </t>
 
-<t t-extend="Warning">
+<t t-name="InteractiveWarning" t-extend="Warning">
     <t t-jquery=".o_notification_content" t-operation="after">
         <t t-call="Notification.reload"/>
         <t t-call="Notification.do_action"/>

From 4fd13e22da3786239a08711a8314166b3acc15fa Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 27 Jun 2018 22:45:55 +0200
Subject: [PATCH 4/5] Make notify options variadic

It opens for extensions.
The implemented options now allow to configure the name and the icon of
the link for the action. Addons could easily add new features as the
arguments are no longer predefined, they'll all be available in the
'options' dictionary.
---
 web_notify/README.rst                      |  7 +++++-
 web_notify/models/res_users.py             | 25 ++++++++++++----------
 web_notify/static/src/js/notification.js   | 17 +++++++--------
 web_notify/static/src/js/web_client.js     | 20 +++++++----------
 web_notify/static/src/xml/notification.xml |  6 +++++-
 5 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/web_notify/README.rst b/web_notify/README.rst
index bff70210..ab0517e5 100644
--- a/web_notify/README.rst
+++ b/web_notify/README.rst
@@ -50,7 +50,12 @@ The action can be used using the ``action`` keyword:
         'res_id': self.id,
         'views': [(False, 'form')],
     })
-   self.env.user.notify_info('My information message', action=action)
+   self.env.user.notify_info(
+       'My information message',
+       action=action,
+       # optional
+       action_link_name=_('Open Sale'),
+   )
 
 
 Installation
diff --git a/web_notify/models/res_users.py b/web_notify/models/res_users.py
index 56cca763..718a996b 100644
--- a/web_notify/models/res_users.py
+++ b/web_notify/models/res_users.py
@@ -26,32 +26,35 @@ class ResUsers(models.Model):
 
     @api.multi
     def notify_info(self, message, title=None, sticky=False,
-                    show_reload=False, action=None):
+                    show_reload=False, action=None,
+                    action_link_name=None, **options):
         title = title or _('Information')
         self._notify_channel(
             'notify_info_channel_name', message, title,
-            sticky, show_reload, action)
+            sticky=sticky, show_reload=show_reload, action=action,
+            action_link_name=action_link_name, **options
+        )
 
     @api.multi
     def notify_warning(self, message, title=None, sticky=False,
-                       show_reload=False, action=None):
+                       show_reload=False, action=None,
+                       action_link_name=None, **options):
         title = title or _('Warning')
         self._notify_channel(
             'notify_warning_channel_name', message, title,
-            sticky, show_reload, action)
+            sticky=sticky, show_reload=show_reload, action=action,
+            action_link_name=action_link_name, **options
+        )
 
     @api.multi
-    def _notify_channel(self, channel_name_field, message, title, sticky,
-                        show_reload, action):
-        if action:
-            action = clean_action(action)
+    def _notify_channel(self, channel_name_field, message, title, **options):
+        if options.get('action'):
+            options['action'] = clean_action(options['action'])
         bus_message = {
             'message': message,
             'title': title,
-            'sticky': sticky,
-            'show_reload': show_reload,
-            'action': action,
         }
+        bus_message.update(options)
         notifications = [(getattr(record, channel_name_field), bus_message)
                          for record in self]
         self.env['bus.bus'].sendmany(notifications)
diff --git a/web_notify/static/src/js/notification.js b/web_notify/static/src/js/notification.js
index e4cb27ba..38cb87ae 100644
--- a/web_notify/static/src/js/notification.js
+++ b/web_notify/static/src/js/notification.js
@@ -5,8 +5,7 @@ odoo.define('web_notify.notification', function (require) {
 
     var base_notification = require('web.notification'),
         WebClient = require('web.WebClient'),
-        Notification = base_notification.Notification,
-        Warning = base_notification.Warning;
+        Notification = base_notification.Notification;
 
     var InteractiveNotification = Notification.extend({
         template: 'InteractiveNotification',
@@ -23,15 +22,15 @@ odoo.define('web_notify.notification', function (require) {
              }
             }
         ),
-        init: function(parent, title, text, sticky, options) {
-            this._super.apply(this, [parent, title, text, sticky]);
+        init: function(parent, title, text, options) {
             this.options = options || {};
+            var sticky = this.options.sticky;
+            this._super.apply(this, [parent, title, text, sticky]);
         },
         reload_active_view: function() {
             this.trigger_up('reload_active_view');
         },
         button_do_action: function() {
-            console.log(this.options.action);
             this.getParent().do_action(this.options.action);
         }
     });
@@ -41,11 +40,11 @@ odoo.define('web_notify.notification', function (require) {
     });
 
     base_notification.NotificationManager.include({
-        interactive_notify(title, text, sticky, options) {
-            return this.display(new InteractiveNotification(this, title, text, sticky, options));
+        interactive_notify(title, text, options) {
+            return this.display(new InteractiveNotification(this, title, text, options));
         },
-        interactive_warn(title, text, sticky, options) {
-            return this.display(new InteractiveWarning(this, title, text, sticky, options));
+        interactive_warn(title, text, options) {
+            return this.display(new InteractiveWarning(this, title, text, options));
         }
 
     });
diff --git a/web_notify/static/src/js/web_client.js b/web_notify/static/src/js/web_client.js
index d7309726..d87b52ff 100644
--- a/web_notify/static/src/js/web_client.js
+++ b/web_notify/static/src/js/web_client.js
@@ -8,17 +8,15 @@ var core = require('web.core'),
 
 
 Widget.include({
-    do_interactive_notify: function(title, message, sticky, options) {
+    do_interactive_notify: function(title, message, options) {
         this.trigger_up(
             'interactive_notification',
-            {title: title, message: message,
-             sticky: sticky, options: options});
+            {title: title, message: message, options: options});
     },
-    do_interactive_warn: function(title, message, sticky, options) {
+    do_interactive_warn: function(title, message, options) {
         this.trigger_up(
             'interactive_warning',
-            {title: title, message: message,
-             sticky: sticky, options: options});
+            {title: title, message: message, options: options});
     },
 });
 
@@ -31,16 +29,14 @@ WebClient.include({
          interactive_notification: function (e) {
              if(this.notification_manager) {
                  this.notification_manager.interactive_notify(
-                     e.data.title, e.data.message,
-                     e.data.sticky, e.data.options
+                     e.data.title, e.data.message, e.data.options
                  );
              }
          },
          interactive_warning: function (e) {
              if(this.notification_manager) {
                  this.notification_manager.interactive_warn(
-                     e.data.title, e.data.message,
-                     e.data.sticky, e.data.options
+                     e.data.title, e.data.message, e.data.options
                  );
              }
          }
@@ -92,14 +88,14 @@ WebClient.include({
     on_message_warning: function(message){
         if(this.notification_manager) {
             this.notification_manager.do_interactive_warn(
-                message.title, message.message, message.sticky, message
+                message.title, message.message, message
             );
         }
     },
     on_message_info: function(message){
         if(this.notification_manager) {
             this.notification_manager.do_interactive_notify(
-                message.title, message.message, message.sticky, message
+                message.title, message.message, message
             );
         }
     }
diff --git a/web_notify/static/src/xml/notification.xml b/web_notify/static/src/xml/notification.xml
index f620fa5c..3fbec2f1 100644
--- a/web_notify/static/src/xml/notification.xml
+++ b/web_notify/static/src/xml/notification.xml
@@ -12,7 +12,11 @@
 <t t-name="Notification.do_action">
     <div class="o_notification_action" t-if="widget.options.action">
         <a href="#" class="o_notification_do_action">
-            <span class="fa fa-arrow-circle-left"/> Open
+            <span t-att-class="'fa ' + (widget.options.action_fa_icon ? widget.options.action_fa_icon : 'fa-arrow-circle-left')"/>
+            <t t-if="widget.options.action_link_name">
+                <t t-esc="widget.options.action_link_name"/>
+            </t>
+            <t t-else="">Open</t>
         </a>
     </div>
 </t>

From 8b2818c73b8622c48e37f6bb8d479c882469bd0e Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 28 Jun 2018 07:55:19 +0200
Subject: [PATCH 5/5] Correct tests

---
 web_notify/tests/test_res_users.py | 57 +++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/web_notify/tests/test_res_users.py b/web_notify/tests/test_res_users.py
index 72416d5e..6f4700c9 100644
--- a/web_notify/tests/test_res_users.py
+++ b/web_notify/tests/test_res_users.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import json
 
 from odoo.tests import common
 from odoo.addons.bus.models.bus import json_dump
@@ -17,12 +18,18 @@ class TestResUsers(common.TransactionCase):
         ]
         existing = bus_bus.search(domain)
         self.env.user.notify_info(
-            message='message', title='title', sticky=True)
+            message='message', title='title', sticky=True,
+            show_reload=True, foo="bar"
+        )
         news = bus_bus.search(domain) - existing
         self.assertEqual(1, len(news))
-        self.assertEqual(
-            '{"message":"message","sticky":true,"title":"title"}',
-            news.message)
+        expected = ('{"message":"message","sticky":true,"title":"title",'
+                    '"show_reload":true,"action":null,'
+                    '"action_link_name":null,"foo":"bar"}')
+        self.assertDictEqual(
+            json.loads(expected),
+            json.loads(news.message)
+        )
 
     def test_notify_warning(self):
         bus_bus = self.env['bus.bus']
@@ -32,12 +39,46 @@ class TestResUsers(common.TransactionCase):
         ]
         existing = bus_bus.search(domain)
         self.env.user.notify_warning(
-            message='message', title='title', sticky=True)
+            message='message', title='title', sticky=True,
+            show_reload=True, foo="bar"
+        )
         news = bus_bus.search(domain) - existing
         self.assertEqual(1, len(news))
-        self.assertEqual(
-            '{"message":"message","sticky":true,"title":"title"}',
-            news.message)
+        expected = ('{"message":"message","sticky":true,"title":"title",'
+                    '"show_reload":true,"action":null,'
+                    '"action_link_name":null,"foo":"bar"}')
+        self.assertDictEqual(
+            json.loads(expected),
+            json.loads(news.message)
+        )
+
+    def test_notify_with_action(self):
+        bus_bus = self.env['bus.bus']
+        domain = [
+            ('channel', '=',
+             json_dump(self.env.user.notify_info_channel_name))
+        ]
+        existing = bus_bus.search(domain)
+        self.env.user.notify_info(
+            message='message', title='title', sticky=True,
+            action={
+                "type": "ir.actions.act_window",
+                "view_mode": "form",
+            },
+            action_link_name="Open"
+        )
+        news = bus_bus.search(domain) - existing
+        self.assertEqual(1, len(news))
+        # the action should be transformed by Odoo (clean_action)
+        expected = ('{"message":"message","sticky":true,"title":"title",'
+                    '"show_reload":false,"action":'
+                    '{"type": "ir.actions.act_window", "view_mode":"form",'
+                    '"flags":{},"views":[[false, "form"]]},'
+                    '"action_link_name":"Open"}')
+        self.assertDictEqual(
+            json.loads(expected),
+            json.loads(news.message)
+        )
 
     def test_notify_many(self):
         # check that the notification of a list of users is done with