From fe2a863b4ff83418676ceb58e895960889bff0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= Date: Tue, 23 Jul 2019 14:22:26 +0200 Subject: [PATCH] fixup! --- mail_activity_team/static/src/scss/systray.scss | 9 --------- mail_activity_team/static/src/xml/systray.xml | 3 --- mail_activity_team/tests/test_mail_activity_team.py | 6 ++---- mail_activity_team/views/assets_backend.xml | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 mail_activity_team/static/src/scss/systray.scss diff --git a/mail_activity_team/static/src/scss/systray.scss b/mail_activity_team/static/src/scss/systray.scss deleted file mode 100644 index ffecef894..000000000 --- a/mail_activity_team/static/src/scss/systray.scss +++ /dev/null @@ -1,9 +0,0 @@ -.o_mail_systray_item { - .o_new_notification_counter { - background: $o-brand-primary; - color: white; - padding: 0em 0.3em; - font-size: 0.7em; - @include o-position-absolute($top: 20%, $right: 1px); - } -} diff --git a/mail_activity_team/static/src/xml/systray.xml b/mail_activity_team/static/src/xml/systray.xml index 9721fd6e1..74aab572d 100644 --- a/mail_activity_team/static/src/xml/systray.xml +++ b/mail_activity_team/static/src/xml/systray.xml @@ -10,9 +10,6 @@ - - - diff --git a/mail_activity_team/tests/test_mail_activity_team.py b/mail_activity_team/tests/test_mail_activity_team.py index 908a657d4..1dbf8f7ac 100644 --- a/mail_activity_team/tests/test_mail_activity_team.py +++ b/mail_activity_team/tests/test_mail_activity_team.py @@ -118,9 +118,7 @@ class TestMailActivityTeam(TransactionCase): self.assertFalse(self.team2.user_id) def test_activity_count(self): - res = self.env['res.users'].with_context( + res = self.env['res.users'].sudo(self.employee.id).with_context( {'team_activities': True} - ).activity_user_count( - user_id=self.employee.id - ) + ).systray_get_activities() self.assertEqual(res[0]['total_count'], 0) diff --git a/mail_activity_team/views/assets_backend.xml b/mail_activity_team/views/assets_backend.xml index a64bf92ce..ff1623cd9 100644 --- a/mail_activity_team/views/assets_backend.xml +++ b/mail_activity_team/views/assets_backend.xml @@ -4,7 +4,6 @@ inherit_id="web.assets_backend">