Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup!

pull/415/head
Adrià Gil Sorribes 2019-07-23 14:22:26 +02:00
parent c50b69dd6b
commit fe2a863b4f
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail_activity_team/static/src/scss/systray.scss
View File

@ -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);
}
}

3
mail_activity_team/static/src/xml/systray.xml
View File

@ -10,9 +10,6 @@
</div>
</div>
</t>
<!-- <t t-jquery=".o_notification_counter" t-operation="replace">-->
<!-- <span class="o_new_notification_counter badge badge-pill"/>-->
<!-- </t>-->
</t>
</templates>

6
mail_activity_team/tests/test_mail_activity_team.py
View File

@ -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)

1
mail_activity_team/views/assets_backend.xml
View File

@ -4,7 +4,6 @@
inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/mail_activity_team/static/src/js/systray.js"/>
<link rel="stylesheet" href="/mail_activity_team/static/src/scss/systray.scss" type="text/scss"/>
</xpath>
</template>
</odoo>