Veld smtp_user gecorrigeerd

INSERT report.url made conditionally dependent on existence

README.md

@@ -1,133 +1,92 @@
-# Mailcatcher Testserver
+# Testserver
 
-## Mailhog installeren
-```
-chmod +x install_mailhog_as_service.sh
-./install_mailhog_as_service.sh
-```
+Module die zoveel mogelijk instellingen/configuratie voor een testomgeving zet.
 
-## Workaround bij foutmelding in Ubuntu 22.04: "note: module requires Go 1.20"
-```
-- Download gewenste versie van Go:
-wget -c https://go.dev/dl/go1.22.0.linux-amd64.tar.gz
+## Getting started
 
-- Ga naar de map waar het bestand staat en pak het uit:
-sudo tar -C /usr/local/ -xzf go1.22.0.linux-amd64.tar.gz
+To make it easy for you to get started with GitLab, here's a list of recommended next steps.
 
-- Set PATH Environment Variable
-export PATH=$PATH:/usr/local/go/bin
+Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
 
-- Voeg onderstaande code toe aan .profile om het definitief te maken:
-# set PATH so it includes /usr/local/go/bin if it exists
-if [ -d "/usr/local/go/bin" ] ; then
-    PATH="/usr/local/go/bin:$PATH"
-fi
+## Add your files
 
-- reload .profile (let op: mét punt!)
-. ~/.profile
-
-- Controleer welke versie van Go actief is:
-go version
-
-- Installeer nu Mailhog met het installatie script
+- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
+- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
 
 ```
-
-## Na de installatie
-```
-systemctl enable mailhog
-```
-reboot server
-
-
-Nginx configuratie (gebruik template: xxx.BEWAREN.mailcatcher.open2bizz.com.conf) 
-
-```
-server {
-  listen 8025;
-  server_name 434-mailcatcher.staging.open2bizz.com;
-
-  # log
-  access_log /var/log/nginx/434.access.log;
-  error_log /var/log/nginx/434.error.log;
-
-  gzip_types text/css text/less text/plain text/xml application/xml application/json application/javascript;
-  gzip on;
-
-
-  location / {
-   #kantoor Open2bizz 83.84.200.111
-    allow 83.84.200.111;
-    allow 83.82.145.237;
-    allow 45.132.40.125;
-    allow 86.93.238.87;
-    allow 80.114.214.241;
-    allow 94.157.36.155;
-    allow 145.131.221.238;
-    deny all;
-
-    auth_basic "Administrator Area";
-    auth_basic_user_file /etc/nginx/.htpasswd;
-
-    proxy_redirect off;
-    proxy_pass http://192.168.78.134:8025;
-  }
-
-    #error pages
-    error_page 500 501 502 503 504 https://www.open2bizz.tech/503;
-
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/434-mailcatcher.staging.open2bizz.com/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/434-mailcatcher.staging.open2bizz.com/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot    
+cd existing_repo
+git remote add origin https://gitlab.com/open2bizz/testserver.git
+git branch -M main
+git push -uf origin main
 ```
 
+## Integrate with your tools
 
+- [ ] [Set up project integrations](https://gitlab.com/open2bizz/testserver/-/settings/integrations)
 
+## Collaborate with your team
 
-In de nginx config file een wachtwoord opnemen:
-```
+- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
+- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
+- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
+- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
 
+## Test and Deploy
 
-========================================================
-Voorbeeld: 
-In de nginx config file voor omgeving 499 een wachtwoord instellen:
-========================================================
+Use the built-in continuous integration in GitLab.
 
-   auth_basic "Administrator Area";
-   auth_basic_user_file /etc/nginx/.htpasswd-499;
-========================================================
+- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
+- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
+- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
+- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
+- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
 
-Voor iedere omgeving is op de 401 een aparte .htpasswd aangemaakt in de map /etc/nginx/
-Voor alle test-omgevingen in de reeks 402 en 499 is een bestand aangemaakt.
-Om een nieuw htpasswd te maken (bijvoorbeeld in de 500-reeks) kan het beste een bestaande file gekopieerd worden:
-   cp /etc/nginx/.htpasswd-402 /etc/nginx/.htpasswd-499
+***
 
-Om al de (verborgen) .htpasswd bestanden opvragen:
-   ls -rtla /etc/nginx | grep .htpasswd
+# Editing this README
 
-Een .htpasswd kan bekeken worden met nano, maar je ziet dan alleen de user én het encrypte wachtwoord:
-   nano  /etc/nginx/.htpasswd-499
+When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
 
-Om een nieuw wachtwoord in te stellen voor de user 'mail' voor omgeving 499:
-   htpasswd /etc/nginx/.htpasswd-499 mail
+## Suggestions for a good README
+Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
 
-=================================================
-Om de wijzigingen toe te passen moet nginx herstart worden:
-service nginx restart
-=================================================
-```
+## Name
+Choose a self-explaining name for your project.
 
+## Description
+Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
 
+## Badges
+On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
 
+## Visuals
+Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
 
-## ODOO: Menu maken voor Mailcatcher
+## Installation
+Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
 
-Maak een Menu aan met de naam Mailcatcher
-Hang deze aan de groep 'Internal User'
-Action: ir.actions.act_url  => Thirdparty apps
-Klik door op 'Thirdparty apps' en verwijs de action URL naar de in nginx opgegeven naam (bijv: https://426-mailcatcher.staging.open2bizz.com/)
-Zet het target op New Window
+## Usage
+Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
 
+## Support
+Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
 
+## Roadmap
+If you have ideas for releases in the future, it is a good idea to list them in the README.
+
+## Contributing
+State if you are open to contributions and what your requirements are for accepting them.
+
+For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+
+You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+
+## Authors and acknowledgment
+Show your appreciation to those who have contributed to the project.
+
+## License
+For open source projects, say how it is licensed.
+
+## Project status
+If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

install_mailhog_as_service.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-echo ""
-set -e
-
-GO_VERSION=1.22.5
-
-echo "==================================="
-echo "Installeren van Go ${GO_VERSION}..."
-echo "==================================="
-
-apt-get update
-apt-get -y install curl ca-certificates
-
-cd /tmp
-curl -LO https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
-
-rm -rf /usr/local/go
-tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
-
-export PATH=/usr/local/go/bin:$PATH
-go version
-
-echo ""
-echo "==================================="
-echo "Installing MailHog (prebuilt binary)..."
-echo "==================================="
-
-# Download de officiële MailHog binary
-curl -sSL -o MailHog https://github.com/mailhog/MailHog/releases/download/v1.0.1/MailHog_linux_amd64
-
-chmod +x MailHog
-mv MailHog /usr/local/bin/MailHog
-
-echo "MailHog binary geïnstalleerd"
-
-echo ""
-echo "==================================="
-echo "Create MailHog service..."
-echo "==================================="
-
-tee /etc/systemd/system/mailhog.service <<EOL
-[Unit]
-Description=MailHog Service
-After=network.target
-
-[Service]
-ExecStart=/usr/local/bin/MailHog
-Restart=always
-User=root
-StandardOutput=journal
-StandardError=journal
-
-[Install]
-WantedBy=multi-user.target
-EOL
-
-systemctl daemon-reload
-systemctl enable mailhog
-systemctl start mailhog
-
-echo ""
-echo "==================================="
-echo "MailHog service created and started."
-echo "==================================="

mailcatcher_menu/__init__.py

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

mailcatcher_menu/__manifest__.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': "mailcatcher_menu",
-
-    'summary': """
-        Add menu-item to local mailcatcher""",
-
-    'description': """
-        Add menu-item to local mailcatcher
-    """,
-
-    'author': "Open2bizz",
-    'website': "http://www.open2bizz.tech",
-    'category': 'Uncategorized',
-    'version': '17.0',
-    'module_type': 'official',
-    'depends': ['mail','base',],
-    'data': [
-        'views/views.xml',
-        'data/data.xml'
-    ],
-}

mailcatcher_menu/controllers/__init__.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import controllers

mailcatcher_menu/controllers/controllers.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# from odoo import http
-
-
-# class TestserverO2b(http.Controller):
-#     @http.route('/testserver_o2b/testserver_o2b/', auth='public')
-#     def index(self, **kw):
-#         return "Hello, world"
-
-#     @http.route('/testserver_o2b/testserver_o2b/objects/', auth='public')
-#     def list(self, **kw):
-#         return http.request.render('testserver_o2b.listing', {
-#             'root': '/testserver_o2b/testserver_o2b',
-#             'objects': http.request.env['testserver_o2b.testserver_o2b'].search([]),
-#         })
-
-#     @http.route('/testserver_o2b/testserver_o2b/objects/<model("testserver_o2b.testserver_o2b"):obj>/', auth='public')
-#     def object(self, obj, **kw):
-#         return http.request.render('testserver_o2b.object', {
-#             'object': obj
-#         })

mailcatcher_menu/data/data.xml

@@ -1,5 +0,0 @@
-<odoo>
-    <data>
-        <function model="ir.config_parameter" name="_mailcatcher_url"/>
-    </data>
-</odoo>

mailcatcher_menu/demo/demo.xml

@@ -1,30 +0,0 @@
-<odoo>
-    <data>
-<!--
-          <record id="object0" model="testserver_o2b.testserver_o2b">
-            <field name="name">Object 0</field>
-            <field name="value">0</field>
-          </record>
-
-          <record id="object1" model="testserver_o2b.testserver_o2b">
-            <field name="name">Object 1</field>
-            <field name="value">10</field>
-          </record>
-
-          <record id="object2" model="testserver_o2b.testserver_o2b">
-            <field name="name">Object 2</field>
-            <field name="value">20</field>
-          </record>
-
-          <record id="object3" model="testserver_o2b.testserver_o2b">
-            <field name="name">Object 3</field>
-            <field name="value">30</field>
-          </record>
-
-          <record id="object4" model="testserver_o2b.testserver_o2b">
-            <field name="name">Object 4</field>
-            <field name="value">40</field>
-          </record>
--->
-    </data>
-</odoo>

mailcatcher_menu/models/__init__.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import mailcatcher_menu

mailcatcher_menu/models/mailcatcher_menu.py

@@ -1,27 +0,0 @@
-# Copyright 2024 Open2Bizz <info@open2bizz.nl>
-# License LGPL-3
-
-from odoo import api, fields, models, _
-
-import logging
-_logger = logging.getLogger(__name__)
-
-class IrActionUrl(models.Model):
-    _inherit = "ir.config_parameter"
-
-    @api.model
-    #def init(self):
-    def _mailcatcher_url(self):
-        parameters = self.env['ir.config_parameter'].search([('key','=', 'web.base.url')])
-        if parameters:
-            parameter = parameters[0]
-            cont_nr = parameter.value.split("//",1)[1] #Haal https://  van string
-            cont_nr = cont_nr[0:3] #De eerste 3 karakters is het containernummer
-            act_url = "https://" + cont_nr + "-mailcatcher.staging.open2bizz.com"
-            _logger.info('----------  ACT_URL ---------- %s', act_url)
-            action_id = self.env['ir.model.data']._xmlid_to_res_id('mailcatcher_menu.action_mailcatcher_url')
-            action = self.env['ir.actions.act_url'].browse(action_id)
-            if action:
-                action.write({'url':act_url})
-
-

mailcatcher_menu/security/ir.model.access.csv

@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mailcatcher_menu_mailcatcher_menu","mailcatcher_menu.mailcatcher_menu","model_mailcatcher_menu_mailcatcher_menu","base.group_user",1,1,1,1

mailcatcher_menu/static/description/index.html

@@ -1,18 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<body>
-<div class="document" id="module-name">
-<h1 class="title">mailcatcher_menu</h1>
-<p>
-	This module is ONLY for test environments In DC Open2Bizz
-</p>
-
-<p>
-	Module is developed by Open2Bizz. Bug reports: support@open2bizz.eu
-</p>
-<p>
-	<img src="https://www.open2bizz.tech/logo.png" style="max-height: 100px;">
-</p>
-
-</div>
-</body>
-</html>

mailcatcher_menu/views/views.xml

@@ -1,14 +0,0 @@
-<odoo>
-  <data>
-
-    <record model="ir.actions.act_url" id="action_mailcatcher_url">
-        <field name="name">Open Mailcatcher</field>
-        <field name="url">https://mailcatcher.staging.open2bizz.com</field> 
-        <field name="target">new</field>
-    </record>
- 
-    <!-- Top menu item -->
-    <menuitem name="MailCatcher" id="mailcatcher_menu.menu_root" sequence="999" web_icon="mailcatcher_menu,static/description/email-icon.png" action="action_mailcatcher_url"/>
-
-  </data>
-</odoo>

testserver_o2b/README.rst

@@ -1,42 +0,0 @@
-====================
-Testserver Open2Bizz
-====================
-
-When installing this module it transforms the database into a test database.
-
-**What happens**
-
-- Adds a RED banner in backend (using module web_environment_ribbon from OCA)
-- Adds a blue banner in backend; stating test env
-- Adds a blue banner in FRONTEND (if website is installed) stating test env
-- Neutralizes the database:
-    - Disables incoming emailserver(s)
-    - Disables outgoing emailserver(s)
-    - Disables ALL cron jobs
-    - Disables Delivery services
-    - Disables Payment providers
-    - Disables Account (Bank) Sync
-    - Disables optional freeze url parameter
-    - Adds ENTERPRISE code from open2bizz (Partner code for test)
-
-Optional: use the added page for website: testserver_page_website
-
-**Manual** override the home page or make **inheritance** like:
-
-<xpath expr="//t[@t-call='website.layout']" position="replace">
-
-==========================
-DO NOT USE IN PRODUCTION ENVIRONMENT
-==========================
-
-**Bugs:**
-
-support@open2bizz.nl
-
-
-This module is maintained by Open2bizz.
-
-.. image:: https://www.open2bizz.tech/logo.png
-   :alt: Open2Bizz
-   :target: https://www.open2bizz.tech
-

testserver_o2b/__manifest__.py

@@ -1,21 +1,20 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "Set as testserver Open2Bizz",
+    'name': "testserver_o2b",
 
     'summary': """
-        This module males an Odoo env into a test env!""",
+        Short (1 phrase/line) summary of the module's purpose, used as
+        subtitle on modules listing or apps.openerp.com""",
 
     'description': """
-        This module males an Odoo env into a test env!
-        Only to be used when installed as TEST env. Open2Bizz
+        Alter Live settings to test settings
     """,
 
     'author': "Open2bizz",
-    'website': "http://www.open2bizz.tech",
+    'website': "https://www.open2bizz.tech",
     'category': 'Uncategorized',
-    'version': '17.0.1.0.0',
-    'license': 'LGPL-3',
-    'depends': ['web_environment_ribbon', 'mail','base','mailcatcher_menu'],
+    'version': '0.1',
+    'depends': ['web_environment_ribbon', 'mail','base',],
     'data': [
         'views/views.xml',
         'views/templates.xml',

testserver_o2b/models/init_test.py

@@ -23,11 +23,8 @@ class IrLogging(models.Model):
         UPDATE ir_config_parameter set value = 'M160129258730' where key = 'database.enterprise_code';
         UPDATE ir_config_parameter set value = (NOW() + INTERVAL '30 DAY') where key = 'database.expiration_date';        
         UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid'; 
-        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');         
-        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
-        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('hnode6.openworx.nl','1025','Algemene mailcatcher vanaf hnode4','login','name','t');
-        UPDATE website SET google_analytics_key = NULL WHERE google_analytics_key IS NOT NULL;
-        UPDATE product_template SET is_published = FALSE WHERE is_published = TRUE;
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_user,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');                 
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_user,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
         """ %(db_id))
         if self.env['ir.config_parameter'].search([('key','=','web.base.url.freeze')]):
             self.env.cr.execute("""DELETE FROM ir_config_parameter WHERE key = 'web.base.url.freeze';""")
@@ -38,20 +35,18 @@ class IrLogging(models.Model):
             field = self.env['ir.model.fields'].search([('name','=','prod_environment'),('model_id','=',model.id)])
             if field:
                 self.env.cr.execute("""UPDATE delivery_carrier SET prod_environment = False WHERE id>0;""")
-        model = self.env['ir.model'].search([('model','=','payment.provider')])
-        if model:
-            field = self.env['ir.model.fields'].search([('name','=','state'),('model_id','=',model.id)])
-            if field:
-                self.env.cr.execute("""UPDATE payment_provider SET state = 'disabled' WHERE id>0;""") 
         model = self.env['ir.model'].search([('model','=','account.online.link')])
         if model:
             field = self.env['ir.model.fields'].search([('id','>',0),('model_id','=',model.id)])
             if field:
                 self.env.cr.execute("""DELETE FROM account_online_link WHERE id > 0;""") 
+        model = self.env['ir.model'].search([('model','=','payment.acquirer')])
+        if model:
+            field = self.env['ir.model.fields'].search([('name','=','state'),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""UPDATE payment_acquirer SET state = 'disabled' WHERE id>0;""")                
         if self.env['ir.model'].search([('model','=','account.journal')]):
             self.env.cr.execute("""UPDATE account_journal set bank_statements_source = 'undefined';""")
-        if self.env['ir.model'].search([('model','=','mail.partner.device')]):
-            self.env.cr.execute("""DELETE FROM mail_partner_device;""")
         ip_ok = False
         with os.popen("ip a") as f:
             for x in f.readlines():
@@ -68,39 +63,3 @@ class IrLogging(models.Model):
         for ap in ADDONS_PATH.split(','):
             if ap[-10:] == 'testserver':
                 _logger.error(os.system('./%s/testserver.sh' %(ap)))
-
-
-        #module_website = self.env['ir.module.module'].search([('name','=','ir.module.module')])
-        module_website = self.env['ir.module.module'].search([('name','=','website')])
-        if module_website.state == 'installed':
-            model_website_page = self.env['ir.model'].search([('model','=','website.page')])
-            if model_website_page:
-                for page in self.env['website.page'].search([('is_published','=',True)]):
-                    page.write({
-                        'is_published': False
-                    })
-                for website in self.env['website'].search([]):
-                    website.write({
-                        'domain': f"None{website.id}"
-                    })
-                for menu in self.env['website.menu'].search([('is_visible','=',True)]):
-                    if menu.website_id and menu.parent_id:
-                        menu.write({
-                            'website_id': False
-                        })
-                    elif menu.website_id and menu.url == "/":
-                        view = self.env['ir.ui.view']._xmlid_to_res_id('testserver_o2b.testserver_page_website')
-                        if view:
-                            menu.page_id.view_id = view.id
-
-        self._disable_web_push_notifications()
-        _logger.debug(f"_______ disable_web_push_notifications ____")
-
-    def _disable_web_push_notifications(self):
-        parameter = self.env['ir.config_parameter'].sudo()
-        parameter.set_param('web_push.notification.enabled', '0')
-
-        parameters = self.env['ir.config_parameter'].sudo().search([
-            ('key', 'in', ('mail.web_push_vapid_private_key', 'mail.web_push_vapid_public_key', 'mail.sfu_server_key'))])
-        for parameter in parameters:
-            parameter.sudo().unlink()

testserver_o2b/views/templates.xml

@@ -1,63 +1,24 @@
 <odoo>
     <data>
-        <!-- Banner for web layout (backend Odoo) -->
-        <template id="testserver_banner_web" name="TOP banner test backend" inherit_id="web.layout">
-            <xpath expr="//body" position="inside">
-                <div>
-                    <span style="text-align: center;color: #FFFFFF;background-color: #006CFE;position: relative;display: block;font-size: 16px;">
-                        This is a test database.
-                        <a href="https://www.open2bizz.tech/helpdesk" target="_blank" style="color: #000000;">
-                           See website to report issue's.
+<!--
+        <template id="listing">
+          <ul>
+            <li t-foreach="objects" t-as="object">
+              <a t-attf-href="#{ root }/objects/#{ object.id }">
+                <t t-esc="object.display_name"/>
               </a>
-                    </span>
-                </div>
-            </xpath>
+            </li>
+          </ul>
         </template>
-
-        <!-- Banner for web layout (website Odoo) -->
-        <!-- MR=> Dit geeft een foutmelding als er geen website geïnstalleerd is!
-        <template id="testserver_banner_website" name="TOP banner test front" inherit_id="website.layout">
-            <xpath expr="//body" position="before">
-                <div>
-                    <span style="text-align: center;color: #FFFFFF;background-color: #006CFE;position: relative;display: block;font-size: 16px;">
-                        ***** This is a test environment *****
-                        <a href="https://www.open2bizz.tech/helpdesk" target="_blank" style="color: #000000;">
-                           See website to report issue's.
-                        </a>
-                    </span>
-                </div>
-            </xpath>
-        </template>
-        -->
-
-        <!-- Replacement layout (website Odoo) -->
-        <template id="testserver_page_website" name="Website page front">
-            <t t-name="website.test-env">
-                <t t-call="website.layout">
-                    <div id="wrap" class="oe_structure oe_empty">
-                        <section class="s_banner parallax s_parallax_is_fixed pb96 o_colored_level pt40"
-                                 data-scroll-background-ratio="1"
-                                 data-snippet="s_banner" data-name="Banner" style="background-image: none;">
-                            <span class="s_parallax_bg oe_img_bg o_bg_img_center"
-                                  style="background-image: url(&quot;https://hd-beamers.nl/wp-content/uploads/2014/05/Testbeeld-1280x720p_hd-ready.png&quot;); background-position: 50% 0px;"/>
-                            <div class="o_we_bg_filter" style="background-image: linear-gradient(135deg, rgba(21, 25, 116, 0.71) 0%, rgba(226, 51, 255, 0.5) 100%);"/>
-                            <div class="container">
-                                <div class="row s_nb_column_fixed">
-                                    <div class="col-lg-6 jumbotron rounded o_cc o_cc1 pt32 pb32 o_colored_level" data-name="Box">
-                                        <h1><font style="font-size: 62px;" class="o_default_snippet_text">TEST</font><br/></h1>
-                                        <p class="lead o_default_snippet_text">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-                                        <a class="mb-2 btn btn-primary" href="/web/login" data-bs-original-title="" title="">Login</a>
-                                        <br/>
-                                        <br/>
-                                        <a class="mb-2 btn btn-secondary" href="https://www.open2bizz.nl" data-bs-original-title="" title="">Open2Bizz</a>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                    </div>
-                </t>
+        <template id="object">
+          <h1><t t-esc="object.display_name"/></h1>
+          <dl>
+            <t t-foreach="object._fields" t-as="field">
+              <dt><t t-esc="field"/></dt>
+              <dd><t t-esc="object[field]"/></dd>
             </t>
+          </dl>
         </template>
-
+-->
     </data>
 </odoo>

web_environment_ribbon/README.rst

@@ -2,13 +2,10 @@
 Web Environment Ribbon
 ======================
 
-.. 
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:633699dce7538787594626fb371be0a97de6e53505ea986d27b7e1faafb870ff
-   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -17,19 +14,18 @@ Web Environment Ribbon
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
-    :target: https://github.com/OCA/web/tree/17.0/web_environment_ribbon
+    :target: https://github.com/OCA/web/tree/15.0/web_environment_ribbon
     :alt: OCA/web
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_environment_ribbon
+    :target: https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_environment_ribbon
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=17.0
-    :alt: Try me on Runboat
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/162/15.0
+    :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-Mark a Test Environment with a red ribbon on the top left corner in
-every page
+Mark a Test Environment with a red ribbon on the top left corner in every page
 
 **Table of contents**
 
@@ -39,29 +35,28 @@ every page
 Configuration
 =============
 
--  You can change the ribbon's name ("TEST") by editing the default
-   system parameter "ribbon.name" (in the menu Settings > Parameters >
-   System Parameters) To hide the ribbon, set this parameter to "False"
-   or delete it.
--  You can customize the ribbon color and background color through
-   system parameters: "ribbon.color", "ribbon.background.color". Fill
-   with valid CSS colors or just set to "False" to use default values.
--  You can add the database name in the ribbon by adding "{db_name}" in
-   the system parameter "ribbon.name".
+* You can change the ribbon's name ("TEST") by editing the default system
+  parameter "ribbon.name" (in the menu Settings > Parameters > System
+  Parameters) To hide the ribbon, set this parameter to "False" or delete it.
+* You can customize the ribbon color and background color through system
+  parameters: "ribbon.color", "ribbon.background.color". Fill with valid CSS
+  colors or just set to "False" to use default values.
+* You can add the database name in the ribbon by adding "{db_name}" in the
+  system parameter "ribbon.name".
 
 Usage
 =====
 
-To use this module, you need only to install it. After installation, a
-red ribbon will be visible on top left corner of every Odoo backend page
+To use this module, you need only to install it. After installation, a red
+ribbon will be visible on top left corner of every Odoo backend page
 
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_environment_ribbon%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_environment_ribbon%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -69,24 +64,24 @@ Credits
 =======
 
 Authors
--------
+~~~~~~~
 
 * Francesco OpenCode Apruzzese
 * Tecnativa
 
 Contributors
-------------
+~~~~~~~~~~~~
 
--  Francesco Apruzzese <cescoap@gmail.com>
--  Javi Melendez <javimelex@gmail.com>
--  Antonio Espinosa <antonio.espinosa@tecnativa.com>
--  Thomas Binsfeld <thomas.binsfeld@acsone.eu>
--  Xavier Jiménez <xavier.jimenez@qubiq.es>
--  Dennis Sluijk <d.sluijk@onestein.nl>
--  Eric Lembregts <eric@lembregts.eu>
+* Francesco Apruzzese <cescoap@gmail.com>
+* Javi Melendez <javimelex@gmail.com>
+* Antonio Espinosa <antonio.espinosa@tecnativa.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
+* Xavier Jiménez <xavier.jimenez@qubiq.es>
+* Dennis Sluijk <d.sluijk@onestein.nl>
+* Eric Lembregts <eric@lembregts.eu>
 
 Maintainers
------------
+~~~~~~~~~~~
 
 This module is maintained by the OCA.
 
@@ -98,6 +93,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/web <https://github.com/OCA/web/tree/17.0/web_environment_ribbon>`_ project on GitHub.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/15.0/web_environment_ribbon>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

web_environment_ribbon/__manifest__.py

@@ -6,7 +6,7 @@
 
 {
     "name": "Web Environment Ribbon",
-    "version": "17.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Web",
     "author": "Francesco OpenCode Apruzzese, "
     "Tecnativa, "
@@ -20,8 +20,8 @@
     "auto_install": False,
     "installable": True,
     "assets": {
-        "web.assets_backend": [
-            "web_environment_ribbon/static/src/components/environment_ribbon/*",
+        "web.assets_common": [
+            "web_environment_ribbon/static/**/*",
         ],
     },
 }

web_environment_ribbon/i18n/ca.po

@@ -16,16 +16,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Nom mostrat"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Última modificació el"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Backend \"Web Environment Ribbon\""
-
-#~ msgid "Display Name"
-#~ msgstr "Nom mostrat"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última modificació el"

web_environment_ribbon/i18n/de.po

@@ -19,16 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Zuletzt geändert am"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Web-Umgebung Ribbon-Backend"
-
-#~ msgid "Display Name"
-#~ msgstr "Anzeigename"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Zuletzt geändert am"

web_environment_ribbon/i18n/es.po

@@ -16,16 +16,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.7.1\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Backend \"Web Environment Ribbon\""
-
-#~ msgid "Display Name"
-#~ msgstr "Nombre mostrado"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última modificación el"

web_environment_ribbon/i18n/fr.po

@@ -19,16 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Backend du bandeau de l'environnement Web"
-
-#~ msgid "Display Name"
-#~ msgstr "Nom affiché"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Dernière modification le"

web_environment_ribbon/i18n/hr.po

@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-07-13 16:06+0000\n"
-"PO-Revision-Date: 2023-01-04 02:41+0000\n"
-"Last-Translator: Bole <bole@dajmi5.com>\n"
+"PO-Revision-Date: 2017-07-13 16:06+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,23 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.14.1\n"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Naziv za prikaz"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Zadnje modificirano"
 
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
-msgstr "Pozadina trake okoline"
-
-#~ msgid "Display Name"
-#~ msgstr "Naziv za prikaz"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Zadnje modificirano"
+msgstr ""

web_environment_ribbon/i18n/nl.po

@@ -16,16 +16,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Weergavenaam"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Laatst Gewijzigd op"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Web Environment Ribbon Backend"
-
-#~ msgid "Display Name"
-#~ msgstr "Weergavenaam"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Laatst Gewijzigd op"

web_environment_ribbon/i18n/nl_NL.po

@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-07-13 16:06+0000\n"
 "PO-Revision-Date: 2021-04-22 15:47+0000\n"
 "Last-Translator: Bosd <c5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me>\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
-"teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/"
+"23907/nl_NL/)\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Weergavenaam"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Laatst bijgewerkt op"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr ""
-
-#~ msgid "Display Name"
-#~ msgstr "Weergavenaam"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Laatst bijgewerkt op"

web_environment_ribbon/i18n/pt.po

@@ -16,16 +16,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.7.1\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Nome a Exibir"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação em"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr ""
-
-#~ msgid "Display Name"
-#~ msgstr "Nome a Exibir"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última Modificação em"

web_environment_ribbon/i18n/pt_BR.po

@@ -20,16 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.1.1\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "Exibir Nome"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "Identificação"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação em"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Back-end da fita do ambiente da Web"
-
-#~ msgid "Display Name"
-#~ msgstr "Exibir Nome"
-
-#~ msgid "ID"
-#~ msgstr "Identificação"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última Modificação em"

web_environment_ribbon/i18n/sl.po

@@ -19,10 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr ""
-
-#~ msgid "ID"
-#~ msgstr "ID"

web_environment_ribbon/i18n/web_environment_ribbon.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

web_environment_ribbon/i18n/zh.po

@@ -1,20 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* web_environment_ribbon
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: zh\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. module: web_environment_ribbon
-#: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
-msgid "Web Environment Ribbon Backend"
-msgstr ""

web_environment_ribbon/i18n/zh_CN.po

@@ -16,16 +16,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend__id
+msgid "ID"
+msgstr "ID"
+
+#. module: web_environment_ribbon
+#: model:ir.model.fields,field_description:web_environment_ribbon.field_web_environment_ribbon_backend____last_update
+msgid "Last Modified on"
+msgstr "最后修改时间"
+
 #. module: web_environment_ribbon
 #: model:ir.model,name:web_environment_ribbon.model_web_environment_ribbon_backend
 msgid "Web Environment Ribbon Backend"
 msgstr "Web环境功能区后台"
-
-#~ msgid "Display Name"
-#~ msgstr "显示名称"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Last Modified on"
-#~ msgstr "最后修改时间"

web_environment_ribbon/models/web_environment_ribbon_backend.py

@@ -5,6 +5,7 @@ from odoo import api, models
 
 
 class WebEnvironmentRibbonBackend(models.AbstractModel):
+
     _name = "web.environment.ribbon.backend"
     _description = "Web Environment Ribbon Backend"
 

web_environment_ribbon/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["whool"]
-build-backend = "whool.buildapi"

web_environment_ribbon/readme/CONFIGURE.md

@@ -1,9 +0,0 @@
-- You can change the ribbon's name ("TEST") by editing the default
-  system parameter "ribbon.name" (in the menu Settings \> Parameters \>
-  System Parameters) To hide the ribbon, set this parameter to "False"
-  or delete it.
-- You can customize the ribbon color and background color through system
-  parameters: "ribbon.color", "ribbon.background.color". Fill with valid
-  CSS colors or just set to "False" to use default values.
-- You can add the database name in the ribbon by adding "{db_name}" in
-  the system parameter "ribbon.name".

web_environment_ribbon/readme/CONFIGURE.rst

@@ -0,0 +1,8 @@
+* You can change the ribbon's name ("TEST") by editing the default system
+  parameter "ribbon.name" (in the menu Settings > Parameters > System
+  Parameters) To hide the ribbon, set this parameter to "False" or delete it.
+* You can customize the ribbon color and background color through system
+  parameters: "ribbon.color", "ribbon.background.color". Fill with valid CSS
+  colors or just set to "False" to use default values.
+* You can add the database name in the ribbon by adding "{db_name}" in the
+  system parameter "ribbon.name".

web_environment_ribbon/readme/CONTRIBUTORS.md

@@ -1,7 +0,0 @@
-- Francesco Apruzzese \<<cescoap@gmail.com>\>
-- Javi Melendez \<<javimelex@gmail.com>\>
-- Antonio Espinosa \<<antonio.espinosa@tecnativa.com>\>
-- Thomas Binsfeld \<<thomas.binsfeld@acsone.eu>\>
-- Xavier Jiménez \<<xavier.jimenez@qubiq.es>\>
-- Dennis Sluijk \<<d.sluijk@onestein.nl>\>
-- Eric Lembregts \<<eric@lembregts.eu>\>

web_environment_ribbon/readme/CONTRIBUTORS.rst

@@ -0,0 +1,7 @@
+* Francesco Apruzzese <cescoap@gmail.com>
+* Javi Melendez <javimelex@gmail.com>
+* Antonio Espinosa <antonio.espinosa@tecnativa.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
+* Xavier Jiménez <xavier.jimenez@qubiq.es>
+* Dennis Sluijk <d.sluijk@onestein.nl>
+* Eric Lembregts <eric@lembregts.eu>

web_environment_ribbon/readme/DESCRIPTION.rst

@@ -1,2 +1 @@
-Mark a Test Environment with a red ribbon on the top left corner in
-every page
+Mark a Test Environment with a red ribbon on the top left corner in every page

web_environment_ribbon/readme/USAGE.md

@@ -1,2 +0,0 @@
-To use this module, you need only to install it. After installation, a
-red ribbon will be visible on top left corner of every Odoo backend page

web_environment_ribbon/readme/USAGE.rst

@@ -0,0 +1,2 @@
+To use this module, you need only to install it. After installation, a red
+ribbon will be visible on top left corner of every Odoo backend page

web_environment_ribbon/static/description/index.html

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Web Environment Ribbon</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,64 +366,60 @@ ul.auto-toc {
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:633699dce7538787594626fb371be0a97de6e53505ea986d27b7e1faafb870ff
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/17.0/web_environment_ribbon"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_environment_ribbon"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>Mark a Test Environment with a red ribbon on the top left corner in
-every page</p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_environment_ribbon"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_environment_ribbon"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Mark a Test Environment with a red ribbon on the top left corner in every page</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 <ul class="simple">
-<li>You can change the ribbon’s name (“TEST”) by editing the default
-system parameter “ribbon.name” (in the menu Settings &gt; Parameters &gt;
-System Parameters) To hide the ribbon, set this parameter to “False”
-or delete it.</li>
-<li>You can customize the ribbon color and background color through
-system parameters: “ribbon.color”, “ribbon.background.color”. Fill
-with valid CSS colors or just set to “False” to use default values.</li>
-<li>You can add the database name in the ribbon by adding “{db_name}” in
-the system parameter “ribbon.name”.</li>
+<li>You can change the ribbon’s name (“TEST”) by editing the default system
+parameter “ribbon.name” (in the menu Settings &gt; Parameters &gt; System
+Parameters) To hide the ribbon, set this parameter to “False” or delete it.</li>
+<li>You can customize the ribbon color and background color through system
+parameters: “ribbon.color”, “ribbon.background.color”. Fill with valid CSS
+colors or just set to “False” to use default values.</li>
+<li>You can add the database name in the ribbon by adding “{db_name}” in the
+system parameter “ribbon.name”.</li>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
-<p>To use this module, you need only to install it. After installation, a
-red ribbon will be visible on top left corner of every Odoo backend page</p>
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need only to install it. After installation, a red
+ribbon will be visible on top left corner of every Odoo backend page</p>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_environment_ribbon%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_environment_ribbon%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <ul class="simple">
 <li>Francesco OpenCode Apruzzese</li>
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Francesco Apruzzese &lt;<a class="reference external" href="mailto:cescoap&#64;gmail.com">cescoap&#64;gmail.com</a>&gt;</li>
 <li>Javi Melendez &lt;<a class="reference external" href="mailto:javimelex&#64;gmail.com">javimelex&#64;gmail.com</a>&gt;</li>
@@ -435,13 +431,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/17.0/web_environment_ribbon">OCA/web</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_environment_ribbon">OCA/web</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

web_environment_ribbon/static/src/components/environment_ribbon/ribbon.esm.js

@@ -1,68 +0,0 @@
-/** @odoo-module **/
-
-import {Component, xml} from "@odoo/owl";
-import {useBus, useService} from "@web/core/utils/hooks";
-import {registry} from "@web/core/registry";
-
-export class WebEnvironmentRibbon extends Component {
-    setup() {
-        this.orm = useService("orm");
-        useBus(this.env.bus, "WEB_CLIENT_READY", this.showRibbon.bind(this));
-    }
-
-    // Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/
-    validStrColour(strToTest) {
-        if (strToTest === "") {
-            return false;
-        }
-        if (strToTest === "inherit") {
-            return true;
-        }
-        if (strToTest === "transparent") {
-            return true;
-        }
-        const image = document.createElement("img");
-        image.style.color = "rgb(0, 0, 0)";
-        image.style.color = strToTest;
-        if (image.style.color !== "rgb(0, 0, 0)") {
-            return true;
-        }
-        image.style.color = "rgb(255, 255, 255)";
-        image.style.color = strToTest;
-        return image.style.color !== "rgb(255, 255, 255)";
-    }
-
-    showRibbon() {
-        const ribbon = $(".test-ribbon");
-        const self = this;
-        ribbon.hide();
-        // Get ribbon data from backend
-        self.orm
-            .call("web.environment.ribbon.backend", "get_environment_ribbon")
-            .then(function (ribbon_data) {
-                // Ribbon name
-                if (ribbon_data.name && ribbon_data.name !== "False") {
-                    ribbon.show();
-                    ribbon.html(ribbon_data.name);
-                }
-                // Ribbon color
-                if (ribbon_data.color && self.validStrColour(ribbon_data.color)) {
-                    ribbon.css("color", ribbon_data.color);
-                }
-                // Ribbon background color
-                if (
-                    ribbon_data.background_color &&
-                    self.validStrColour(ribbon_data.background_color)
-                ) {
-                    ribbon.css("background-color", ribbon_data.background_color);
-                }
-            });
-    }
-}
-
-WebEnvironmentRibbon.props = {};
-WebEnvironmentRibbon.template = xml`<div class="test-ribbon" />`;
-
-registry.category("main_components").add("WebEnvironmentRibbon", {
-    Component: WebEnvironmentRibbon,
-});

web_environment_ribbon/static/src/css/ribbon.css

@@ -27,3 +27,10 @@
 .test-ribbon b {
     font-size: 20px;
 }
+
+header:hover ~ .test-ribbon,
+nav:hover ~ .test-ribbon {
+    /* Ease out ribbon when user is using the navigation in Odoo */
+    opacity: 0;
+    transition: 0.2s ease;
+}

web_environment_ribbon/static/src/js/ribbon.js

@@ -0,0 +1,62 @@
+/* Copyright 2015 Sylvain Calador <sylvain.calador@akretion.com>
+   Copyright 2015 Javi Melendez <javi.melendez@algios.com>
+   Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
+   Copyright 2017 Thomas Binsfeld <thomas.binsfeld@acsone.eu>
+   Copyright 2017 Xavier Jiménez <xavier.jimenez@qubiq.es>
+   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
+
+odoo.define("web_environment_ribbon.ribbon", function (require) {
+    "use strict";
+    var rpc = require("web.rpc");
+    var core = require("web.core");
+
+    // Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/
+    function validStrColour(strToTest) {
+        if (strToTest === "") {
+            return false;
+        }
+        if (strToTest === "inherit") {
+            return true;
+        }
+        if (strToTest === "transparent") {
+            return true;
+        }
+        var image = document.createElement("img");
+        image.style.color = "rgb(0, 0, 0)";
+        image.style.color = strToTest;
+        if (image.style.color !== "rgb(0, 0, 0)") {
+            return true;
+        }
+        image.style.color = "rgb(255, 255, 255)";
+        image.style.color = strToTest;
+        return image.style.color !== "rgb(255, 255, 255)";
+    }
+
+    core.bus.on("web_client_ready", null, function () {
+        var ribbon = $('<div class="test-ribbon hidden"/>');
+        $("body").append(ribbon);
+        ribbon.hide();
+        // Get ribbon data from backend
+        rpc.query({
+            model: "web.environment.ribbon.backend",
+            method: "get_environment_ribbon",
+        }).then(function (ribbon_data) {
+            // Ribbon name
+            if (ribbon_data.name && ribbon_data.name !== "False") {
+                ribbon.html(ribbon_data.name);
+                ribbon.show();
+            }
+            // Ribbon color
+            if (ribbon_data.color && validStrColour(ribbon_data.color)) {
+                ribbon.css("color", ribbon_data.color);
+            }
+            // Ribbon background color
+            if (
+                ribbon_data.background_color &&
+                validStrColour(ribbon_data.background_color)
+            ) {
+                ribbon.css("background-color", ribbon_data.background_color);
+            }
+        });
+    });
+});

web_environment_ribbon/tests/test_environment_ribbon_data.py

@@ -7,7 +7,7 @@ from odoo.tests import common
 class TestEnvironmentRibbonData(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
-        super().setUpClass()
+        super(TestEnvironmentRibbonData, cls).setUpClass()
         cls.env["ir.config_parameter"].set_param("ribbon.name", "Test Ribbon {db_name}")
         cls.env["ir.config_parameter"].set_param("ribbon.color", "#000000")
         cls.env["ir.config_parameter"].set_param("ribbon.background.color", "#FFFFFF")
@@ -18,7 +18,7 @@ class TestEnvironmentRibbonData(common.TransactionCase):
         ribbon = self.env["web.environment.ribbon.backend"].get_environment_ribbon()
 
         expected_ribbon = {
-            "name": f"Test Ribbon {self.env.cr.dbname}",
+            "name": "Test Ribbon {db_name}".format(db_name=self.env.cr.dbname),
             "color": "#000000",
             "background_color": "#FFFFFF",
         }