Browse Source

Merge pull request #285 from yelizariev/12.0-pre-commit-16

💚 pre-commit run --all
pull/291/head
Denis Mudarisov 5 years ago
committed by GitHub
parent
commit
eb5aefebfe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      mail_all/views/templates.xml
  2. 14
      mail_move_message/mail_move_message_views.xml
  3. 9
      mail_private/full_composer_wizard.xml
  4. 3
      mail_private/static/src/xml/mail_private.xml
  5. 8
      mail_to/static/src/xml/recipient.xml
  6. 6
      res_partner_company_messages/views.xml

5
mail_all/views/templates.xml

@ -11,10 +11,7 @@
> >
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" href="/mail_all/static/src/css/mail_all.css" /> <link rel="stylesheet" href="/mail_all/static/src/css/mail_all.css" />
<script
src="/mail_all/static/src/js/mail_all.js"
type="text/javascript"
/>
<script src="/mail_all/static/src/js/mail_all.js" type="text/javascript" />
<script <script
src="/mail_all/static/src/js/test_mail_all.js" src="/mail_all/static/src/js/test_mail_all.js"
type="text/javascript" type="text/javascript"

14
mail_move_message/mail_move_message_views.xml

@ -4,8 +4,11 @@
# Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr> # Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
# License MIT (https://opensource.org/licenses/MIT).--> # License MIT (https://opensource.org/licenses/MIT).-->
<odoo> <odoo>
<template id="assets_backend" name="custom bar assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="custom bar assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link <link
rel="stylesheet" rel="stylesheet"
@ -17,20 +20,17 @@
/> />
</xpath> </xpath>
</template> </template>
<record id="view_wizard" model="ir.ui.view"> <record id="view_wizard" model="ir.ui.view">
<field name="name">mail_move_message.wizard.view</field> <field name="name">mail_move_message.wizard.view</field>
<field name="model">mail_move_message.wizard</field> <field name="model">mail_move_message.wizard</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Move Message"> <form string="Move Message">
<field name="can_move" invisible="1" /> <field name="can_move" invisible="1" />
<field name="message_is_moved" invisible="1" /> <field name="message_is_moved" invisible="1" />
<field name="message_name_from" invisible="1" /> <field name="message_name_from" invisible="1" />
<field name="message_email_from" invisible="1" /> <field name="message_email_from" invisible="1" />
<field name="message_to_read" invisible="1" /> <field name="message_to_read" invisible="1" />
<field name="uid" invisible="1" /> <field name="uid" invisible="1" />
<p <p
attrs="{'invisible':[('can_move', '!=', False)]}" attrs="{'invisible':[('can_move', '!=', False)]}"
>You cannot move this message. It was already moved with a message bellow. Open one and apply changes there.</p> >You cannot move this message. It was already moved with a message bellow. Open one and apply changes there.</p>
@ -47,7 +47,6 @@
class="oe_highlight" class="oe_highlight"
/> />
</group> </group>
<group attrs="{'invisible':[('can_move', '=', False)]}" colspan="2"> <group attrs="{'invisible':[('can_move', '=', False)]}" colspan="2">
<label for="model_record" /> <label for="model_record" />
<div> <div>
@ -129,7 +128,6 @@
</form> </form>
</field> </field>
</record> </record>
<!-- Relocation config wizard --> <!-- Relocation config wizard -->
<record id="view_mail_move_message_config_settings" model="ir.ui.view"> <record id="view_mail_move_message_config_settings" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit</field> <field name="name">res.config.settings.view.form.inherit</field>
@ -170,7 +168,6 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="action_mail_move_message_config" model="ir.actions.act_window"> <record id="action_mail_move_message_config" model="ir.actions.act_window">
<field name="name">Mail Relocation</field> <field name="name">Mail Relocation</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -180,5 +177,4 @@
<field name="target">inline</field> <field name="target">inline</field>
<field name="context">{'module' : 'mail_move_message'}</field> <field name="context">{'module' : 'mail_move_message'}</field>
</record> </record>
</odoo> </odoo>

9
mail_private/full_composer_wizard.xml

@ -3,7 +3,6 @@
Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/> Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
License MIT (https://opensource.org/licenses/MIT).--> License MIT (https://opensource.org/licenses/MIT).-->
<odoo> <odoo>
<record model="ir.ui.view" id="email_compose_message_wizard_form_private"> <record model="ir.ui.view" id="email_compose_message_wizard_form_private">
<field name="name">mail.compose.message.form.private</field> <field name="name">mail.compose.message.form.private</field>
<field name="model">mail.compose.message</field> <field name="model">mail.compose.message</field>
@ -11,23 +10,17 @@
<field name="inherit_id" ref="mail.email_compose_message_wizard_form" /> <field name="inherit_id" ref="mail.email_compose_message_wizard_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//field[@name='active_domain']" position="after"> <xpath expr="//field[@name='active_domain']" position="after">
<field name="is_private" invisible="1" /> <field name="is_private" invisible="1" />
</xpath> </xpath>
<xpath <xpath
expr="//div[@groups='base.group_user']/span[2]" expr="//div[@groups='base.group_user']/span[2]"
position="attributes" position="attributes"
> >
<attribute
name="attrs"
>{'invisible': [('is_private', '=', True)]}
<attribute name="attrs">{'invisible': [('is_private', '=', True)]}
</attribute> </attribute>
</xpath> </xpath>
</data> </data>
</field> </field>
</record> </record>
</odoo> </odoo>

3
mail_private/static/src/xml/mail_private.xml

@ -3,7 +3,6 @@
Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/> Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
License MIT (https://opensource.org/licenses/MIT).--> License MIT (https://opensource.org/licenses/MIT).-->
<template> <template>
<t t-extend="mail.chatter.Buttons"> <t t-extend="mail.chatter.Buttons">
<t t-jquery="button[title='Send a message']" t-operation="after"> <t t-jquery="button[title='Send a message']" t-operation="after">
<button <button
@ -13,7 +12,6 @@
>Send internal message</button> >Send internal message</button>
</t> </t>
</t> </t>
<t t-extend="mail.chatter.Composer"> <t t-extend="mail.chatter.Composer">
<t t-jquery="small[class='o_chatter_composer_info']" t-operation="replace"> <t t-jquery="small[class='o_chatter_composer_info']" t-operation="replace">
<small class="o_chatter_composer_info" t-if="!widget.options.is_private"> <small class="o_chatter_composer_info" t-if="!widget.options.is_private">
@ -33,5 +31,4 @@
>Uncheck all</button> >Uncheck all</button>
</t> </t>
</t> </t>
</template> </template>

8
mail_to/static/src/xml/recipient.xml

@ -2,11 +2,9 @@
<template> <template>
<t t-extend="mail.widget.Thread.Message"> <t t-extend="mail.widget.Thread.Message">
<t t-jquery="p.o_mail_info" t-operation="append"> <t t-jquery="p.o_mail_info" t-operation="append">
<span class="recipients_info"> <span class="recipients_info">
<t t-set="partner_ids" t-value="message.getCustomerEmailData()" /> <t t-set="partner_ids" t-value="message.getCustomerEmailData()" />
<t t-if="partner_ids"> <t t-if="partner_ids">
<t t-if="partner_ids.length > 0">To: </t> <t t-if="partner_ids.length > 0">To: </t>
<t t-foreach="partner_ids.length" t-as="i"> <t t-foreach="partner_ids.length" t-as="i">
<t t-if="i &lt; 4"> <t t-if="i &lt; 4">
@ -14,9 +12,8 @@
t-att-href="_.str.sprintf('/web?#id=%s&amp;view_type=form&amp;model=res.partner', partner_ids[i][0])" t-att-href="_.str.sprintf('/web?#id=%s&amp;view_type=form&amp;model=res.partner', partner_ids[i][0])"
class="recipient_link" class="recipient_link"
> >
<i t-esc="partner_ids[i][1]" /><t
t-if="i &lt; partner_ids.length - 1"
>; </t>
<i t-esc="partner_ids[i][1]" />
<t t-if="i &lt; partner_ids.length - 1">; </t>
</a> </a>
</t> </t>
</t> </t>
@ -25,7 +22,6 @@
and <t t-esc="partner_ids.length - 4" /> more and <t t-esc="partner_ids.length - 4" /> more
</span> </span>
</t> </t>
</t> </t>
</span> </span>
</t> </t>

6
res_partner_company_messages/views.xml

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<openerp><data>
</data></openerp>
<openerp>
<data>
</data>
</openerp>
Loading…
Cancel
Save