!8291 Merge remote-tracking branch 'origin/dev' into dev

Merge pull request !8291 from 李鹏宇/dev

yuthon_tianhe/__manifest__.py

@@ -26,8 +26,7 @@
         'views/auth_oauth_template.xml',
         'views/left_login_template.xml',
         'views/right_login_template.xml',
-        'views/right_login_template.xml',
-        # 'views/inherit_board_views.xml',
+        'views/inherit_board_views.xml',
     ]
 
 }

yuthon_tianhe/views/left_login_template.xml

@@ -67,9 +67,9 @@
                         <a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}">还没有账户?</a>
                         <a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}">重置密码</a>
                     </div>
-<!--                    <div class="o_login_auth">-->
-<!--                        <t t-call="yuthon_tianhe.yuthon_providers"/>-->
-<!--                    </div>-->
+                    <div class="o_login_auth">
+                        <t t-call="yuthon_tianhe.yuthon_providers"/>
+                    </div>
                 </div>
 
                 <input type="hidden" name="redirect" t-att-value="redirect"/>

yuthon_tianhe/views/right_login_template.xml

@@ -68,9 +68,9 @@
                         <a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}">还没有账户?</a>
                         <a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}">重置密码</a>
                     </div>
-<!--                    <div class="o_login_auth">-->
-<!--                        <t t-call="yuthon_tianhe.yuthon_providers"/>-->
-<!--                    </div>-->
+                    <div class="o_login_auth">
+                        <t t-call="yuthon_tianhe.yuthon_providers"/>
+                    </div>
                 </div>
 
                 <input type="hidden" name="redirect" t-att-value="redirect"/>

yuthon_wechat/data/auth_oauth_provider.xml

@@ -5,7 +5,7 @@
             <field name="name">Wechat Corp</field>
             <field name="body">企业微信扫码登录</field>
             <field name="client_id">corpid agentid corpsecret</field>
-            <field name="css_class">fa fa-fw fa-sign-in text-primary wecom_qr_login</field>
+            <field name="css_class">fa fa-fw fa-sign-in text-primary</field>
             <field name="auth_endpoint">https://open.work.weixin.qq.com/wwopen/sso/qrConnect</field>
             <field name="validation_endpoint">https://qyapi.weixin.qq.com/cgi-bin/gettoken</field>
             <field name="data_endpoint">https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo</field>
@@ -15,7 +15,7 @@
             <field name="name">Wechat Corp2</field>
             <field name="body">企业微信直接登录</field>
             <field name="client_id">corpid agentid corpsecret</field>
-            <field name="css_class">fa fa-fw fa-sign-in text-primary wecom_quick_login</field>
+            <field name="css_class">fa fa-fw fa-sign-in text-primary</field>
             <field name="auth_endpoint">https://open.weixin.qq.com/connect/oauth2/authorize</field>
             <field name="validation_endpoint">https://qyapi.weixin.qq.com/cgi-bin/gettoken</field>
             <field name="data_endpoint">https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo</field>