Browse Source

Merge pull request #491 from JayVora-SerpentCS/10-web-notify

Migrated web notify
pull/509/head
Stéphane Bidoul (ACSONE) 8 years ago
committed by GitHub
parent
commit
9f04db67cc
  1. 1
      setup/web_notify/odoo/__init__.py
  2. 1
      setup/web_notify/odoo/addons/__init__.py
  3. 1
      setup/web_notify/odoo/addons/web_notify
  4. 6
      setup/web_notify/setup.py
  5. 1
      web_notify/README.rst
  6. 5
      web_notify/__manifest__.py
  7. 2
      web_notify/models/res_users.py
  8. 4
      web_notify/static/src/js/web_client.js
  9. 6
      web_notify/tests/test_res_users.py

1
setup/web_notify/odoo/__init__.py

@ -0,0 +1 @@
__import__('pkg_resources').declare_namespace(__name__)

1
setup/web_notify/odoo/addons/__init__.py

@ -0,0 +1 @@
__import__('pkg_resources').declare_namespace(__name__)

1
setup/web_notify/odoo/addons/web_notify

@ -0,0 +1 @@
../../../../web_notify

6
setup/web_notify/setup.py

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

1
web_notify/README.rst

@ -63,6 +63,7 @@ Contributors
------------ ------------
* Laurent Mignon <laurent.mignon@acsone.eu> * Laurent Mignon <laurent.mignon@acsone.eu>
* Serpent Consulting Services Pvt. Ltd.<jay.vora@serpentcs.com>
Maintainer Maintainer
---------- ----------

5
web_notify/__manifest__.py

@ -6,7 +6,8 @@
'name': 'Web Notify', 'name': 'Web Notify',
'summary': """ 'summary': """
Send notification messages to user""", Send notification messages to user""",
'version': '9.0.1.0.0',
'version': '10.0.1.0.0',
'description': 'Web Notify',
'license': 'AGPL-3', 'license': 'AGPL-3',
'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)',
'website': 'https://acsone.eu/', 'website': 'https://acsone.eu/',
@ -19,5 +20,5 @@
], ],
'demo': [ 'demo': [
], ],
'installable': False,
'installable': True,
} }

2
web_notify/models/res_users.py

@ -2,7 +2,7 @@
# Copyright 2016 ACSONE SA/NV # Copyright 2016 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp import api, fields, models, _
from odoo import api, fields, models, _
class ResUsers(models.Model): class ResUsers(models.Model):

4
web_notify/static/src/js/web_client.js

@ -3,15 +3,15 @@ odoo.define('web_notify.WebClient', function (require) {
var WebClient = require('web.WebClient'); var WebClient = require('web.WebClient');
var base_bus = require('bus.bus'); var base_bus = require('bus.bus');
var _ = require('_');
WebClient.include({ WebClient.include({
init: function(parent, client_options){ init: function(parent, client_options){
this._super(parent, client_options); this._super(parent, client_options);
}, },
show_application: function() { show_application: function() {
this._super();
var res = this._super();
this.start_polling(); this.start_polling();
return res
}, },
on_logout: function() { on_logout: function() {
var self = this; var self = this;

6
web_notify/tests/test_res_users.py

@ -2,8 +2,8 @@
# Copyright 2016 ACSONE SA/NV # Copyright 2016 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp.tests import common
from openerp.addons.bus.models.bus import json_dump
from odoo.tests import common
from odoo.addons.bus.models.bus import json_dump
import mock import mock
@ -42,7 +42,7 @@ class TestResUsers(common.TransactionCase):
def test_notify_many(self): def test_notify_many(self):
# check that the notification of a list of users is done with # check that the notification of a list of users is done with
# a single call to the bus # a single call to the bus
with mock.patch('openerp.addons.bus.models.bus.ImBus.sendmany'
with mock.patch('odoo.addons.bus.models.bus.ImBus.sendmany'
) as mockedSendMany: ) as mockedSendMany:
users = self.env.user.search([(1, "=", 1)]) users = self.env.user.search([(1, "=", 1)])
self.assertTrue(len(users) > 1) self.assertTrue(len(users) > 1)

Loading…
Cancel
Save