Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Apply pre-commit changes: Resolve conflicts

Browse Source
This commit is contained in:
Alexandre D. Díaz 2021-01-26 17:37:52 +01:00 committed by Jasmin Solanki
parent c64663944b
commit 55f9271937
3 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_tracking/__manifest__.py
View File

@ -9,7 +9,7 @@
"summary": "Email tracking system for all mails sent", "summary": "Email tracking system for all mails sent",
"version": "13.0.1.0.6", "version": "13.0.1.0.6",
"category": "Social Network", "category": "Social Network",
"website": "http://github.com/OCA/social", "website": "https://github.com/OCA/social",
"author": ("Tecnativa, " "Odoo Community Association (OCA)"), "author": ("Tecnativa, " "Odoo Community Association (OCA)"),
"license": "AGPL-3", "license": "AGPL-3",
"application": False, "application": False,

6
mail_tracking/data/tracking_data.xml
View File

@ -2,7 +2,11 @@
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com> <!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
<odoo> <odoo>
<record forcecreate="True" id="decimal_tracking_timestamp" model="decimal.precision"> <record
forcecreate="True"
id="decimal_tracking_timestamp"
model="decimal.precision"
>
<field name="name">MailTracking Timestamp</field> <field name="name">MailTracking Timestamp</field>
<field name="digits">6</field> <field name="digits">6</field>
</record> </record>

46
mail_tracking/static/src/xml/failed_message/thread.xml
View File

@ -2,12 +2,18 @@
<templates xml:space="preserve"> <templates xml:space="preserve">
<t t-name="mail_tracking.failed_message_items"> <t t-name="mail_tracking.failed_message_items">
<div class="o_thread_date_separator o_border_dashed collapsed" data-toggle="collapse" data-target="#o_chatter_failed_message"> <div
class="o_thread_date_separator o_border_dashed collapsed"
data-toggle="collapse"
data-target="#o_chatter_failed_message"
>
<a role="button" class="o_thread_date btn"> <a role="button" class="o_thread_date btn">
<i class="fa fa-fw fa-caret-down" /> <i class="fa fa-fw fa-caret-down" />
Failed messages Failed messages
<small class="o_chatter_failed_message_summary ml8"> <small class="o_chatter_failed_message_summary ml8">
<span class="badge rounded-circle badge-danger"><t t-esc="nbFailedMessages"/></span> <span class="badge rounded-circle badge-danger"><t
t-esc="nbFailedMessages"
/></span>
</small> </small>
</a> </a>
</div> </div>
@ -16,9 +22,16 @@
<div class="o_thread_message" style="margin-bottom: 10px"> <div class="o_thread_message" style="margin-bottom: 10px">
<div class="o_thread_message_sidebar"> <div class="o_thread_message_sidebar">
<div class="o_avatar_stack"> <div class="o_avatar_stack">
<img t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small" class="o_thread_message_avatar rounded-circle mb8" t-att-title="message.author[1]" t-att-alt="message.author[1]"/> <img
<i t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'" t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small"
title="Failed"/> class="o_thread_message_avatar rounded-circle mb8"
t-att-title="message.author[1]"
t-att-alt="message.author[1]"
/>
<i
t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'"
title="Failed"
/>
</div> </div>
</div> </div>
<div class="o_thread_message_core"> <div class="o_thread_message_core">
@ -26,12 +39,23 @@
<strong class="o_thread_author"> <strong class="o_thread_author">
<t t-esc="message.author[1]" /> <t t-esc="message.author[1]" />
</strong> </strong>
- <small class="o_mail_timestamp" t-att-title="message.date.format(date_format)"><t t-esc="message.hour"/></small> - <small
class="o_mail_timestamp"
t-att-title="message.date.format(date_format)"
><t t-esc="message.hour" /></small>
<span t-attf-class="o_thread_icons"> <span t-attf-class="o_thread_icons">
<a href="#" class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link" t-att-data-message-id="message.id"> <a
href="#"
class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link"
t-att-data-message-id="message.id"
>
<i class="fa fa-check" /> Set as Reviewed <i class="fa fa-check" /> Set as Reviewed
</a> </a>
<a href="#" class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry" t-att-data-message-id="message.id"> <a
href="#"
class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry"
t-att-data-message-id="message.id"
>
<i class="fa fa-retweet" /> Retry <i class="fa fa-retweet" /> Retry
</a> </a>
</span> </span>
@ -41,9 +65,11 @@
<t t-if="!recipient_first"> <t t-if="!recipient_first">
- -
</t> </t>
<a class="o_mail_action_tracking_partner" <a
class="o_mail_action_tracking_partner"
t-att-data-partner="recipient[0]" t-att-data-partner="recipient[0]"
t-attf-href="#model=res.partner&amp;id=#{recipient[0]}"> t-attf-href="#model=res.partner&amp;id=#{recipient[0]}"
>
<t t-esc="recipient[1]" /> <t t-esc="recipient[1]" />
</a> </a>
</t> </t>