mirror of https://github.com/OCA/social.git
fixup!
parent
c50b69dd6b
commit
fe2a863b4f
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -10,9 +10,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</t>
|
</t>
|
||||||
<!-- <t t-jquery=".o_notification_counter" t-operation="replace">-->
|
|
||||||
<!-- <span class="o_new_notification_counter badge badge-pill"/>-->
|
|
||||||
<!-- </t>-->
|
|
||||||
</t>
|
</t>
|
||||||
|
|
||||||
</templates>
|
</templates>
|
||||||
|
|
|
@ -118,9 +118,7 @@ class TestMailActivityTeam(TransactionCase):
|
||||||
self.assertFalse(self.team2.user_id)
|
self.assertFalse(self.team2.user_id)
|
||||||
|
|
||||||
def test_activity_count(self):
|
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}
|
{'team_activities': True}
|
||||||
).activity_user_count(
|
).systray_get_activities()
|
||||||
user_id=self.employee.id
|
|
||||||
)
|
|
||||||
self.assertEqual(res[0]['total_count'], 0)
|
self.assertEqual(res[0]['total_count'], 0)
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
inherit_id="web.assets_backend">
|
inherit_id="web.assets_backend">
|
||||||
<xpath expr="." position="inside">
|
<xpath expr="." position="inside">
|
||||||
<script type="text/javascript" src="/mail_activity_team/static/src/js/systray.js"/>
|
<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>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|
Loading…
Reference in New Issue