Accept Merge Request #134: (feature/优化工单 -> develop)

Merge Request: 优化修改网站标题

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/134

sf_manufacturing/models/tray.py

@@ -18,42 +18,7 @@ class Tray(models.Model):
 
     @api.onchange('production_id')
     def updateTrayState(self):
-
+        if self.workorder_id != False and self.create_date != False:
-        if self.workorder_id != False:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
             self.state = '占用'
         else:

sf_manufacturing/views/mrp_workorder_view.xml

@@ -57,7 +57,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="mrp_workorder_action_tablet">
-        <field name="name">工单详情</field>
+        <field name="name">工单</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.workorder</field>
         <field name="view_mode">tree,kanban,form</field>
@@ -66,7 +66,7 @@
             (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
-        <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>
+        <field name="domain">[('state', '!=', 'cancel')]</field>
         <field name="context">{'search_default_workcenter_id': active_id}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_workorder">

vista_backend_theme/__init__.py

@@ -21,3 +21,5 @@
 #############################################################################
 from .hooks import test_pre_init_hook, test_post_init_hook
 from . import wizard
+from . import models
+

vista_backend_theme/__manifest__.py

@@ -30,7 +30,7 @@
     'company': 'Cybrosys Techno Solutions',
     'maintainer': 'Cybrosys Techno Solutions',
     'website': "https://www.cybrosys.com",
-    "depends": ['base', 'web', 'mail'],
+    "depends": ['base', 'web', 'mail', 'base_setup'],
     "data": [
         'security/ir.model.access.csv',
         'views/icons.xml',
@@ -38,6 +38,7 @@
         'views/theme.xml',
         'views/assets.xml',
         'data/theme_data.xml',
+        'views/res_config.xml',
     ],
     'assets': {
         'web.assets_backend': {
@@ -47,15 +48,18 @@
             '/vista_backend_theme/static/src/js/chrome/sidebar_menu.js',
             '/vista_backend_theme/static/src/xml/systray.xml',
             '/vista_backend_theme/static/src/xml/top_bar.xml',
+            '/vista_backend_theme/static/src/js/web_window_title.js',
         },
         'web.assets_frontend': {
             '/vista_backend_theme/static/src/scss/login.scss',
             '/vista_backend_theme/static/src/scss/login.scss',
+
         },
     },
     'images': [
         'static/description/banner.png',
         'static/description/theme_screenshot.png',
+        'static/description/main_screenshot.png',
     ],
     'license': 'LGPL-3',
     'pre_init_hook': 'test_pre_init_hook',

vista_backend_theme/data/demo.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+         <record id="config_parameter_web_base_title_demo" model="ir.config_parameter">
+            <field name="key">web.base.title</field>
+            <field name="value">Demo</field>
+        </record>
+
+    </data>
+</openerp>

vista_backend_theme/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import ir_ui_view
+from . import res_config

vista_backend_theme/models/ir_ui_view.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+import logging
+
+from odoo import api, fields, models, _
+
+_logger = logging.getLogger(__name__)
+
+class View(models.Model):
+    _inherit = 'ir.ui.view'
+
+    @api.model
+    def _render_template(self, template, values=None):
+        if template in ['web.login', 'web.webclient_bootstrap']:
+            if not values:
+                values = {}
+            values["title"] = self.env['ir.config_parameter'].sudo().get_param("web.base.title", "")
+        return super(View, self)._render_template(template, values)

vista_backend_theme/models/res_config.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+import logging
+
+from odoo import api, fields, models, _
+
+_logger = logging.getLogger(__name__)
+
+CONFIG_PARAM_WEB_WINDOW_TITLE = "web.base.title"
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    web_window_title = fields.Char('Window Title')
+
+    @api.model
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        ir_config = self.env['ir.config_parameter'].sudo()
+        web_window_title = ir_config.get_param(CONFIG_PARAM_WEB_WINDOW_TITLE, default='')
+        res.update(
+            web_window_title=web_window_title
+        )
+        return res
+
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        ir_config = self.env['ir.config_parameter'].sudo()
+        ir_config.set_param(CONFIG_PARAM_WEB_WINDOW_TITLE, self.web_window_title or "")

vista_backend_theme/static/src/js/web_window_title.js

@@ -0,0 +1,12 @@
+/** @odoo-module alias=web.window.title **/
+
+import { WebClient } from "@web/webclient/webclient";
+import {patch} from "@web/core/utils/patch";
+
+patch(WebClient.prototype, "Web Window Title", {
+    setup() {
+        const title = document.title;
+        this._super();
+        this.title.setParts({ zopenerp: title });
+    }
+});

vista_backend_theme/views/res_config.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.web.window.title</field>
+            <field name="model">res.config.settings</field>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
+            <field name="arch" type="xml">
+                <div id="languages" position="before">
+                    <h2>视窗</h2>
+                    <div class="row mt16 o_settings_container" name="window">
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_right_pane">
+                                <span class="o_form_label">标题</span>
+                                <div class="text-muted">
+                                    自定义网站窗口标题
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16 row">
+                                        <label for="web_window_title" string="标题" class="col-3 col-lg-3 o_light_label"/>
+                                        <field name="web_window_title" class="oe_inline"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </field>
+        </record>
+
+    </data>
+</odoo>