Skip to content

Commit

Permalink
完成添加企微用户 关注者
Browse files Browse the repository at this point in the history
  • Loading branch information
@rainbow-studio-solution
rainbow-studio-solution committed Feb 4, 2022
1 parent f28c6ed commit e469d1c
Show file tree
Hide file tree
Showing 11 changed files with 232 additions and 102 deletions.
61 changes: 31 additions & 30 deletions wecom_api/views/res_config_settings_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,34 +192,6 @@
</div>
</div>

<!-- 发送应用消息 -->
<h2 id="wecom_push" class="d-flex justify-content-between">
<span class="text-left">
<i class="fa fa-envelope-o fa-lg" aria-label="WeCom Message"/>
WeCom Message
<i class="fa fa-lg fa-info-circle fa-lg" title="The values set below are the companies identified as WeCom organizations." />
</span>
<widget name='res_config_wecom_navigation_gotop'/>
</h2>
<div class="row mt16 o_settings_container" attrs="{'invisible': [('module_wecom_auth_oauth','=',False)]}">
<div class="col-12 col-lg-6 o_setting_box" id="wecom_message_install">
<div class="o_setting_left_pane">
<field name="module_wecom_message"/>
</div>
<div class="o_setting_right_pane" id="wecom_message_settings">
<label for="module_wecom_message"/>
<div class="text-muted">
Intercept the e-mail with the target identification as the user object of enterprise wechat, and push text, picture, video, file, graphic and other types of messages to the target object through enterprise wechat.
</div>
<div class="content-group" attrs="{'invisible': [('module_wecom_message', '=', False)]}" id="wecom_message_warning">
<div class="mt8 text-warning">
<strong>Save</strong> this page and come back here to set up other feature.
</div>
</div>
</div>
</div>
</div>

<!-- 门户 -->
<h2 id="wecom_portal" class="d-flex justify-content-between">
<span class="text-left">
Expand Down Expand Up @@ -276,8 +248,6 @@
</div>
</div>



<!-- 会话内容存档 -->
<h2 id="wecom_msgaudit" class="d-flex justify-content-between">
<span class="text-left">
Expand Down Expand Up @@ -306,6 +276,37 @@
</div>
</div>
</div>

<!-- 发送应用消息 -->
<h2 id="wecom_push" class="d-flex justify-content-between">
<span class="text-left">
<i class="fa fa-envelope-o fa-lg" aria-label="WeCom Message"/>
WeCom Message
<i class="fa fa-lg fa-info-circle fa-lg" title="The values set below are the companies identified as WeCom organizations." />
</span>
<widget name='res_config_wecom_navigation_gotop'/>
</h2>
<div class="row mt16 o_settings_container" attrs="{'invisible': [('module_wecom_auth_oauth','=',False)]}">
<div class="col-12 col-lg-6 o_setting_box" id="wecom_message_install">
<div class="o_setting_left_pane">
<field name="module_wecom_message"/>
</div>
<div class="o_setting_right_pane" id="wecom_message_settings">
<label for="module_wecom_message"/>
<div class="text-muted">
Intercept the e-mail with the target identification as the user object of enterprise wechat, and push text, picture, video, file, graphic and other types of messages to the target object through enterprise wechat.
</div>
<div class="content-group" attrs="{'invisible': [('module_wecom_message', '=', False)]}" id="wecom_message_warning">
<div class="mt8 text-warning">
<strong>Save</strong> this page and come back here to set up other feature.
</div>
</div>
</div>
</div>
</div>



</xpath>
</field>
</record>
Expand Down
5 changes: 3 additions & 2 deletions wecom_contacts/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
""",
"depends": ["contacts", "wecom_message",],
"data": ["views/res_partner_views.xml",],
"depends": ["contacts",],
"data": ["views/res_partner_views.xml",
],
"external_dependencies": {"python": [],},
"qweb": ["static/src/xml/*.xml",],
}
Expand Down
11 changes: 11 additions & 0 deletions wecom_contacts/views/res_partner_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
</field>
</record>

<!-- <record id="view_partner_tree" model="ir.ui.view">
<field name="name">res.partner.tree</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='field']" position="after">
<field name="is_wecom_user"/>
</xpath>
</field>
</record> -->

<record id="view_partner_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
Expand Down
4 changes: 3 additions & 1 deletion wecom_message/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"rating",
"wecom_widget",
"wecom_material",
"wecom_contacts",
"wecom_auth_oauth",
],
"external_dependencies": {"python": ["html2text", "lxml"],},
Expand All @@ -31,6 +32,7 @@
"data/message_data.xml",
# "data/message_template_data.xml",
"wizard/mail_template_preview_views.xml",
"wizard/invite_view.xml",
"views/assets_templates.xml",
# "views/mail_message_views.xml",
"views/res_users_views.xml",
Expand All @@ -41,7 +43,7 @@
# "views/wecom_message_message_views.xml",
# "views/wecom_apps_views.xml",
# "views/wecom_message_notification_views.xml",
"views/menu.xml",
"views/menu_views.xml",
],
"qweb": ["static/src/xml/*.xml",],
# "post_init_hook": "_auto_install_lang",
Expand Down
18 changes: 3 additions & 15 deletions wecom_message/i18n/zh_CN.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,6 @@ msgstr "显示名称"
msgid "Dynamic Placeholder Generator"
msgstr "动态定位符生成器"

#. module: wecom_message
#: model:ir.actions.act_window,name:wecom_message.action_view_wecom_mail
msgid "EMail Messages"
msgstr "EMail消息"

#. module: wecom_message
#: model_terms:ir.ui.view,arch_db:wecom_message.view_wecom_mail_search
Expand Down Expand Up @@ -397,11 +393,7 @@ msgstr "消息选项"
msgid "Message Template Preview"
msgstr "消息模板预览"

#. module: wecom_message
#: model:ir.actions.act_window,name:wecom_message.action_wecom_message_template_tree_all model_terms:ir.ui.view,arch_db:wecom_message.wecom_message_template_tree
#: model_terms:ir.ui.view,arch_db:wecom_message.wecom_message_template_view_form
msgid "Message Templates"
msgstr "消息模板"


#. module: wecom_message
#: model_terms:ir.ui.view,arch_db:wecom_message.view_wecom_mail_form
Expand Down Expand Up @@ -581,10 +573,6 @@ msgstr "发送重置密码建议"
msgid "Send Password Reset Instructions Message"
msgstr "发送重置密码建议消息"

#. module: wecom_message
#: model:ir.ui.menu,name:wecom_message.menu_wecom_message_records
msgid "Send Records"
msgstr "发送记录"

#. module: wecom_message
#: model_terms:ir.ui.view,arch_db:wecom_message.res_users_view_form
Expand Down Expand Up @@ -638,8 +626,8 @@ msgstr "任务卡片消息"

#. module: wecom_message
#: model:ir.ui.menu,name:wecom_message.menu_wecom_message_template
msgid "Template"
msgstr "消息模板"
msgid "Email Message Template"
msgstr "邮件消息模板"

#. module: wecom_message
#: model:ir.model.fields.selection,name:wecom_message.selection__mail_mail__msgtype__template_card model:ir.model.fields.selection,name:wecom_message.selection__mail_template__msgtype__template_card
Expand Down
2 changes: 1 addition & 1 deletion wecom_message/views/mail_template_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</record> -->

<record id="action_wecom_message_template_tree_all" model="ir.actions.act_window">
<field name="name">Message Templates</field>
<field name="name">Email Message Templates</field>
<field name="res_model">mail.template</field>
<field name="view_mode">tree,form</field>
<field name="view_ids" eval="[(5, 0, 0),
Expand Down
112 changes: 61 additions & 51 deletions wecom_message/views/menu.xml → wecom_message/views/menu_views.xml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data>
<!-- ROOT -->
<menuitem id="menu_wecom_message_root" name="Message" groups="base.group_erp_manager" parent="wecom_base.menu_wecom_root" sequence="3"/>

<!-- 对应菜单：设置→技术→讨论 -->
<menuitem id="menu_wecom_message_records" name="Send Records" parent="menu_wecom_message_root" sequence="1"/>
<!-- 0.消息 -->

<!-- 1.邮件 -->
<menuitem id="menu_wecom_message_message" name="Email Message" parent="menu_wecom_message_records" action="action_view_wecom_mail" groups="base.group_erp_manager" sequence="1"/>

<!-- 2.跟踪值 -->
<!-- <menuitem name="Tracking Values" id="menu_wecom_discuss_tracking_value" parent="menu_wecom_discuss" action="mail.action_view_mail_tracking_value" sequence="2"/> -->
<!-- 3.活动 -->
<!-- <menuitem id="menu_wecom_discuss_activities" action="mail.mail_activity_action" parent="menu_wecom_discuss" sequence="3" /> -->

<!-- 4.通知 -->
<menuitem name="Notifications" id="menu_wecom_message_notification" parent="menu_wecom_message_records" action="wecom_message_notification_action" sequence="4" groups="base.group_erp_manager"/>

<!-- 5.点评 -->
<!-- <menuitem name="Ratings" id="menu_wecom_discuss_rating" parent="menu_wecom_discuss" action="rating.rating_rating_view" sequence="5"/> -->

<!-- 6.黑名单 -->
<!-- <menuitem name="Email Blacklist" id="menu_wecom_discuss_blacklist" action="mail.mail_blacklist_action" parent="menu_wecom_discuss" sequence="6"/> -->

<!-- 对应菜单：设置→技术→电子邮件 -->
<menuitem id="menu_wecom_message_settings" name="Settings" parent="menu_wecom_message_root" sequence="2"/>

<!-- 1.邮件 -->
<!-- <menuitem id="menu_wecom_email_message" name="EMail Message" parent="menu_wecom_message_settings" action="action_view_wecom_mail" groups="base.group_erp_manager" sequence="1"/> -->

<!-- 2.模板 -->
<menuitem id="menu_wecom_message_template" name="Template" parent="menu_wecom_message_settings" groups="base.group_erp_manager" action="action_wecom_message_template_tree_all" sequence="2"/>




<!-- <menuitem id="menu_wecom_configuration" name="Settings" parent="menu_wecom_message_root" sequence="900" action="wecom_message.wecom_message_config_settings_action" groups="base.group_erp_manager"/> -->

<!-- <menuitem id="menu_wecom_message" name="Message" parent="menu_wecom_message_root" sequence="97" /> -->

<!-- <menuitem id="menu_wecom_message_records" name="Records" parent="wecom_message.menu_wecom_message_root" groups="base.group_system" action="action_view_wecom_message_records" sequence="10"/> -->



<!-- <menuitem id="menu_message_template" name="Template(EMail)" parent="menu_wecom_message" action="action_view_wecom_message_template_tree_all" sequence="20"/> -->

</data>
</odoo>
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data>
<!-- ROOT -->
<menuitem id="menu_wecom_message_root" name="Message" groups="base.group_erp_manager" parent="wecom_base.menu_wecom_root" sequence="3"/>


<!-- 1.讨论 对应菜单：设置→技术→讨论 -->
<menuitem id="menu_wecom_message_discuss" name="Discuss" parent="menu_wecom_message_root" sequence="1"/>
<!-- 1.1.消息 -->


<!-- 1.6.通知 -->
<menuitem name="Notifications" id="menu_wecom_message_notification" parent="menu_wecom_message_discuss" action="wecom_message_notification_action" sequence="5" groups="base.group_erp_manager"/>


<!-- 2.邮件 应菜单：设置→技术→电子邮件-->
<menuitem id="menu_wecom_message_email" name="Email" parent="menu_wecom_message_root" sequence="1"/>

<!-- 2.1 邮件 应菜单：设置→技术→电子邮件-->
<menuitem id="menu_wecom_message_email_list" name="Email Message" parent="menu_wecom_message_email" action="action_view_wecom_mail" groups="base.group_erp_manager" sequence="1"/>

<!-- 2.4模板 -->
<menuitem id="menu_wecom_message_template" name="Email Message Template" parent="menu_wecom_message_email" groups="base.group_erp_manager" action="action_wecom_message_template_tree_all" sequence="4"/>

<!-- 2.跟踪值 -->
<!-- <menuitem name="Tracking Values" id="menu_wecom_discuss_tracking_value" parent="menu_wecom_discuss" action="mail.action_view_mail_tracking_value" sequence="2"/> -->
<!-- 3.活动 -->
<!-- <menuitem id="menu_wecom_discuss_activities" action="mail.mail_activity_action" parent="menu_wecom_discuss" sequence="3" /> -->



<!-- 5.点评 -->
<!-- <menuitem name="Ratings" id="menu_wecom_discuss_rating" parent="menu_wecom_discuss" action="rating.rating_rating_view" sequence="5"/> -->

<!-- 6.黑名单 -->
<!-- <menuitem name="Email Blacklist" id="menu_wecom_discuss_blacklist" action="mail.mail_blacklist_action" parent="menu_wecom_discuss" sequence="6"/> -->

<!-- 对应菜单：设置→技术→电子邮件 -->
<menuitem id="menu_wecom_message_settings" name="Settings" parent="menu_wecom_message_root" sequence="2"/>

<!-- 1.邮件 -->
<!-- <menuitem id="menu_wecom_email_message" name="EMail Message" parent="menu_wecom_message_settings" action="action_view_wecom_mail" groups="base.group_erp_manager" sequence="1"/> -->






<!-- <menuitem id="menu_wecom_configuration" name="Settings" parent="menu_wecom_message_root" sequence="900" action="wecom_message.wecom_message_config_settings_action" groups="base.group_erp_manager"/> -->

<!-- <menuitem id="menu_wecom_message" name="Message" parent="menu_wecom_message_root" sequence="97" /> -->

<!-- <menuitem id="menu_wecom_message_email" name="Records" parent="wecom_message.menu_wecom_message_root" groups="base.group_system" action="action_view_wecom_message_records" sequence="10"/> -->



<!-- <menuitem id="menu_message_template" name="Template(EMail)" parent="menu_wecom_message" action="action_view_wecom_message_template_tree_all" sequence="20"/> -->

</data>
</odoo>
4 changes: 2 additions & 2 deletions wecom_message/views/res_config_settings_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<div class="mt8">
<field name="message_app_id" class="w-100 " widget="selection" domain="['&amp;',('type_code', 'like', '%message%'),('company_id', '=', company_id)]"/>
</div>
<button class="btn btn-primary" name="get_app_info" string="Get application info" type="object" icon="fa-cloud-download" attrs="{'invisible': [('material_app_id','=',False)]}"/>
<div class="mt4" attrs="{'invisible': [('material_app_id','=',False)]}">
<button class="btn btn-primary" name="get_app_info" string="Get application info" type="object" icon="fa-cloud-download" attrs="{'invisible': [('message_app_id','=',False)]}"/>
<div class="mt4" attrs="{'invisible': [('message_app_id','=',False)]}">
<div class="text-warning mt16">
<strong>Save</strong> this page and come back here to set up other feature.</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions wecom_message/wizard/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-

# from . import mail_compose_message
from . import invite
from . import mail_template_preview
Loading

0 comments on commit e469d1c

Please sign in to comment.