[13.0] Последние изменения

.travis.yml

@@ -22,22 +22,21 @@ addons:
 
 env:
   global:
-  - OPTIONS="--log-db=openerp_test --load=web,queue_job"
-  - VERSION="13.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0"
-  - PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
-  - DISABLE_PYLINT='absent-index-html,manifest-image'
+    - VERSION="13.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0"
+    - OPTIONS="--log-db=openerp_test --load=web,queue_job"
+    - PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
+    - DISABLE_PYLINT='absent-index-html,manifest-image,manifest-name'
 
   matrix:
-  - LINT_CHECK="1"
-  - CHECK_TAGS="1"
-  - MAKEPOT="1"
-  - TESTS="1" ODOO_REPO="odoo/odoo"
-  # OCA/OCB doesn't have master branch. TODO: uncomment this in odoo 12
-  #- TESTS="1" ODOO_REPO="OCA/OCB"
+    - LINT_CHECK="1"
+    - CHECK_TAGS="1"
+    - MAKEPOT="1"
+    - TESTS="1" ODOO_REPO="odoo/odoo"
+    - TESTS="1" ODOO_REPO="OCA/OCB"
 
 install:
   - pip install anybox.testing.openerp
-  - git clone https://github.com/it-projects-llc/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - git clone https://github.com/em230418/maintainer-quality-tools.git -b saas-addons ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
   - travis_install_nightly
 

oca_dependencies.txt

@@ -1,2 +1,5 @@
 queue https://github.com/OCA/queue.git
-OCA_web https://github.com/OCA/web.git
+web https://github.com/OCA/web.git
+access-addons https://github.com/itpp-labs/access-addons.git
+server-auth https://github.com/OCA/server-auth.git
+contract https://github.com/OCA/contract.git

saas/__manifest__.py

@@ -1,14 +1,15 @@
 # Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2018-2019 Denis Mudarisov <https://it-projects.info/team/mudarisov>
 # Copyright 2019 Anvar Kildebekov <https://it-projects.info/team/kildebekov>
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": """SaaS Base""",
     "summary": """Base module for master SaaS instance""",
     "category": "SaaS",
     # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=13.0",
     "images": [],
-    "version": "13.0.2.4.3",
+    "version": "13.0.3.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Ivan Yelizariev",

saas/controllers/main.py

@@ -12,5 +12,7 @@ class SaasController(odoo.http.Controller):
     def auth_to_build(self, build_id=None, **kwargs):
         if not build_id:
             return False
-        build_url = request.env['saas.db'].browse(build_id).get_url() + '/auth_quick/login?build_login=admin'
+        build = request.env['saas.db'].browse(build_id)
+        _, _, build_admin_id = build.xmlid_lookup("base.user_admin")
+        build_url = request.env['saas.db'].browse(build_id).get_url() + '/auth_quick/login?build_user_id={}'.format(build_admin_id)
         return build_redirection(build_url)

saas/data/ir_cron_data.xml

@@ -1,4 +1,5 @@
 <!-- Copyright 2019 Denis Mudarisov <https://it-projects.info/team/trojikman>
+     Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).-->
 <odoo noupdate="1">
         <record id="preparing_template_next_cron" model="ir.cron">
@@ -13,4 +14,17 @@
             <field name="state">code</field>
             <field name="code">model.preparing_template_next()</field>
         </record>
+
+        <record id="refresh_saas_db_data" model="ir.cron">
+            <field name="name">SaaS: refresh data from build database</field>
+            <field name="model_id" ref="saas.model_saas_db"/>
+            <field name="active" eval="True" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field name="doall">1</field>
+            <field name="state">code</field>
+            <field name="code">model.search([('type','=','build'),('state','=','done')]).refresh_data()</field>
+        </record>
 </odoo>

saas/data/saas_operator_data.xml

@@ -4,7 +4,7 @@
     <record id="local_operator" model="saas.operator">
         <field name="name">Same Instance</field>
         <field name="type">local</field>
-        <field name="db_url_template">http://{db_name}.{db_id}.127.0.0.1.nip.io</field>
+        <field name="db_url_template">http://{db_name}.127.0.0.1.nip.io</field>
         <field name="db_name_template">fast_build_{unique_id}</field>
         <!-- It works when db-filter=^%d$ -->
         <field name="global_url" eval="'http://' + obj().env.cr.dbname + '.127.0.0.1.nip.io:8069'" model="saas.operator"/>

saas/doc/changelog.rst

@@ -1,3 +1,20 @@
+`3.0.0`
+-------
+
+- **Improvement:** mandatory modules can be redefined in dependent modules
+- **New:** added "Refresh" in build view to get data from build database
+- **Fix:** random_ready_operator does not throw exceptions if no operators are ready
+- **Fix:** no extra rigths required to read build's URL
+- **Improvement:** Removed {db_id} variable for generating database name
+- **Improvement:** Added helper methods `execute_kw` and `xmlid_lookup` on `saas.db` model
+- **Fix:** attempt to update global_url on draft builds
+- **Improvement:** Added option to deploy database on draft builds
+- **Fix:** "Connect to the Build" button now works even if admin user on build was renamed
+- **Improvement:** Added "Operators" menu to show list of operators
+- **Improvement:** saas.operator.name field is now mandatory
+- **Fix:** Do not run tests when installing modules in builds
+- **Improvement:** Added "Install missing mandatory modules" button in build and template operator views on developer mode
+
 `2.4.3`
 -------
 

saas/models/__init__.py

@@ -4,3 +4,4 @@
 from . import saas_db
 from . import saas_log
 from . import auth_quick_master_token
+from . import queue_job

saas/models/queue_job.py

@@ -0,0 +1,10 @@
+from odoo import models
+
+
+class QueueJob(models.Model):
+    _inherit = "queue.job"
+
+    def write(self, vals):
+        res = super(QueueJob, self).write(vals)
+        self.flush()
+        return res

saas/models/saas_db.py

@@ -1,5 +1,6 @@
 # Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2019 Denis Mudarisov <https://it-projects.info/team/trojikman>
+# Copyright 2020 Eugene Molotov <https://it-projects.info/team/em230418>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 from odoo import models, fields
 from odoo.addons.queue_job.job import job
@@ -44,7 +45,7 @@ def drop_db(self):
     def get_url(self):
         # TODO: need possibility to use custom domain
         self.ensure_one()
-        return self.operator_id.get_db_url(self)
+        return self.sudo().operator_id.get_db_url(self)
 
     def action_get_build_access(self):
         auth_url = '/saas/auth-to-build/' + str(self.id)
@@ -53,3 +54,36 @@ def action_get_build_access(self):
             'target': 'new',
             'url': auth_url,
         }
+
+    def write(self, vals):
+        res = super(SAASDB, self).write(vals)
+        if not self.env.context.get("writing_from_refresh_data"):  # Do not run "refresh_data", if already running it
+            self.refresh_data()
+        return res
+
+    def refresh_data(self, should_read_from_build=True, should_write_to_build=True):
+        for record in self.filtered(lambda record: (record.type, record.state) == ("build", "done")).with_context(writing_from_refresh_data=True):
+            if should_read_from_build:
+                vals = record.read_values_from_build()
+                if vals:
+                    record.write(vals)
+
+            if should_write_to_build:
+                record.write_values_to_build()
+
+    def write_values_to_build(self):
+        pass
+
+    def read_values_from_build(self):
+        return {}
+
+    def execute_kw(self, model, method, *args, **kwargs):
+        return self.operator_id.build_execute_kw(self, model, method, args, kwargs)
+
+    def xmlid_lookup(self, xmlid):
+        return self.execute_kw("ir.model.data", "xmlid_lookup", xmlid)
+
+    def action_install_missing_mandatory_modules(self):
+        for build in self:
+            operator = build.operator_id
+            operator._install_modules(build.name, [('name', 'in', operator.get_mandatory_modules())])