Skip to content

Commit

Permalink
[17.0][MIG] web_company_color: Migration to 17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
psugne committed Oct 16, 2024
1 parent e042d7b commit 1d483d7
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 67 deletions.
42 changes: 22 additions & 20 deletions web_company_color/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Web Company Color
: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/16.0/web_company_color
:target: https://github.com/OCA/web/tree/17.0/web_company_color
:alt: OCA/web
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_company_color
:target: https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_company_color
: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=16.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=17.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand All @@ -38,50 +38,52 @@ This module change navbar colors based in the company logo colors.
Usage
=====

Go to company record and set a logo. Can see/modify applied colors on the "Navbar" section.
Go to company record and set a logo. Can see/modify applied colors on
the "Navbar" section.

For optimal results use images with alpha channel.

Known issues / Roadmap
======================

White color is omitted in the addition operation to support images without alpha channel.
White color is omitted in the addition operation to support images
without alpha channel.

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_company_color%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_company_color%0Aversion:%2017.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.

Credits
=======

Authors
~~~~~~~
-------

* Alexandre Díaz

Contributors
~~~~~~~~~~~~
------------

* Jordi Ballester Alomar <jordi.ballester@forgeflow.com> (ForgeFlow)
* Lois Rilo <lois.rilo@forgeflow.com> (ForgeFlow)
* Simone Orsi <simone.orsi@camptocamp.com>
* Iván Antón <ozono@ozonomultimedia.com>
* Bernat Puig <bernat.puig@forgeflow.com> (ForgeFlow)
* Dhara Solanki <dhara.solanki@initos.com>
* `Tecnativa <https://www.tecnativa.com>`_:
- Jordi Ballester Alomar <jordi.ballester@forgeflow.com> (ForgeFlow)
- Lois Rilo <lois.rilo@forgeflow.com> (ForgeFlow)
- Simone Orsi <simone.orsi@camptocamp.com>
- Iván Antón <ozono@ozonomultimedia.com>
- Bernat Puig <bernat.puig@forgeflow.com> (ForgeFlow)
- Dhara Solanki <dhara.solanki@initos.com>
- `Tecnativa <https://www.tecnativa.com>`__:

* Jairo Llopis
* Alexandre Díaz
* Carlos Roca
- Jairo Llopis
- Alexandre Díaz
- Carlos Roca

Maintainers
~~~~~~~~~~~
-----------

This module is maintained by the OCA.

Expand All @@ -93,6 +95,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/16.0/web_company_color>`_ project on GitHub.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/17.0/web_company_color>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion web_company_color/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"name": "Web Company Color",
"category": "web",
"version": "16.0.1.2.3",
"version": "17.0.1.0.0",
"author": "Alexandre Díaz, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web",
"depends": ["web", "base_sparse_field"],
Expand Down
7 changes: 2 additions & 5 deletions web_company_color/hooks.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Copyright 2019 Alexandre Díaz <dev@redneboa.es>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import SUPERUSER_ID, api

from .models.res_company import URL_BASE


def uninstall_hook(cr, registry):
env = api.Environment(cr, SUPERUSER_ID, {})
def uninstall_hook(env):
env["ir.attachment"].search([("url", "=like", "%s%%" % URL_BASE)]).unlink()


def post_init_hook(cr, registry):
env = api.Environment(cr, SUPERUSER_ID, {})
def post_init_hook(env):
env["res.company"].search([]).scss_create_or_update_attachment()
6 changes: 2 additions & 4 deletions web_company_color/models/assetsbundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo.http import request

from odoo.addons.base.models.assetsbundle import AssetsBundle, ScssStylesheetAsset
from odoo.addons.base.models.assetsbundle import AssetsBundle


class AssetsBundleCompanyColor(AssetsBundle):
Expand All @@ -17,6 +17,4 @@ def get_company_color_asset_node(self):
company_id = (
self.env["res.company"].browse(active_company_id) or self.env.company
)
asset = ScssStylesheetAsset(self, url=company_id.scss_get_url())
compiled = self.compile_css(asset.compile, asset.get_source())
return "style", {}, compiled
return company_id.scss_get_url()
31 changes: 13 additions & 18 deletions web_company_color/models/ir_qweb.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,26 @@
class QWeb(models.AbstractModel):
_inherit = "ir.qweb"

def _generate_asset_nodes_cache(
self,
bundle,
css=True,
js=True,
debug=False,
async_load=False,
defer_load=False,
lazy_load=False,
media=None,
def _generate_asset_links_cache(
self, bundle, css=True, js=True, assets_params=None, rtl=False
):
res = super()._generate_asset_nodes(
bundle, css, js, debug, async_load, defer_load, lazy_load, media
)
res = super()._generate_asset_links_cache(bundle, css, js, assets_params, rtl)
if bundle == "web_company_color.company_color_assets":
asset = AssetsBundleCompanyColor(
bundle, [], env=self.env, css=True, js=True
bundle,
[],
env=self.env,
css=True,
js=True,
debug_assets=False,
rtl=rtl,
assets_params=assets_params,
)
res += [asset.get_company_color_asset_node()]
return res

def _get_asset_content(self, bundle, defer_load=False, lazy_load=False, media=None):
def _get_asset_content(self, bundle, assets_params=None):
"""Handle 'special' web_company_color bundle"""
if bundle == "web_company_color.company_color_assets":
return [], []
return super()._get_asset_content(
bundle, defer_load=defer_load, lazy_load=lazy_load, media=media
)
return super()._get_asset_content(bundle, assets_params=assets_params)
3 changes: 3 additions & 0 deletions web_company_color/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
10 changes: 10 additions & 0 deletions web_company_color/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- Jordi Ballester Alomar \<<jordi.ballester@forgeflow.com>\> (ForgeFlow)
- Lois Rilo \<<lois.rilo@forgeflow.com>\> (ForgeFlow)
- Simone Orsi \<<simone.orsi@camptocamp.com>\>
- Iván Antón \<<ozono@ozonomultimedia.com>\>
- Bernat Puig \<<bernat.puig@forgeflow.com>\> (ForgeFlow)
- Dhara Solanki \<<dhara.solanki@initos.com>\>
- [Tecnativa](https://www.tecnativa.com):
- Jairo Llopis
- Alexandre Díaz
- Carlos Roca
11 changes: 0 additions & 11 deletions web_company_color/readme/CONTRIBUTORS.rst

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
White color is omitted in the addition operation to support images without alpha channel.
White color is omitted in the addition operation to support images
without alpha channel.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Go to company record and set a logo. Can see/modify applied colors on the "Navbar" section.
Go to company record and set a logo. Can see/modify applied colors on
the "Navbar" section.

For optimal results use images with alpha channel.
12 changes: 7 additions & 5 deletions web_company_color/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Web Company Color</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8a814ac88491029ca65ef378be730bd05a762604c5913f24f9cf1c6ea5b160cb
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/16.0/web_company_color"><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-16-0/web-16-0-web_company_color"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<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_company_color"><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_company_color"><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>This module change navbar colors based in the company logo colors.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
Expand All @@ -387,19 +387,21 @@ <h1 class="title">Web Company Color</h1>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p>Go to company record and set a logo. Can see/modify applied colors on the “Navbar” section.</p>
<p>Go to company record and set a logo. Can see/modify applied colors on
the “Navbar” section.</p>
<p>For optimal results use images with alpha channel.</p>
</div>
<div class="section" id="known-issues-roadmap">
<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
<p>White color is omitted in the addition operation to support images without alpha channel.</p>
<p>White color is omitted in the addition operation to support images
without alpha channel.</p>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-3">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_company_color%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_company_color%0Aversion:%2017.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">
Expand Down Expand Up @@ -436,7 +438,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<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/16.0/web_company_color">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/17.0/web_company_color">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>
Expand Down
2 changes: 1 addition & 1 deletion web_company_color/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def n_rgb_to_hex(_r, _g, _b):
return "#{:02x}{:02x}{:02x}".format(int(255 * _r), int(255 * _g), int(255 * _b))
return f"#{int(255 * _r):02x}{int(255 * _g):02x}{int(255 * _b):02x}"


def convert_to_image(field_binary):
Expand Down

0 comments on commit 1d483d7

Please sign in to comment.