Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 31, 2025

See odoo/odoo#104836

task-2963840

Forward-Port-Of: #15051
Forward-Port-Of: #14984

@robodoo
Copy link
Collaborator

robodoo commented Oct 31, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 31, 2025

@qsm-odoo while this was properly forward-ported, at least one co-dependent PR (odoo/odoo#233899, odoo/enterprise#98530, odoo/design-themes#1175) did not succeed. You will need to fix it before this can be merged.

Both this PR and the others will need to be approved via @robodoo r+ as they are all considered “in conflict”.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 8, 2025

@qsm-odoo this forward port of #14984 is awaiting action (not merged or closed).

Also removes outdated things in the `<template>` tag documentation and
reviews it a bit.

See odoo/odoo#104836

task-2963840

X-original-commit: e69b371
@qsm-odoo qsm-odoo force-pushed the saas-18.3-15.0-assets_ignore_active-bso-473394-fw branch from 51686ab to b0c0e9f Compare November 10, 2025 09:32
@C3POdoo C3POdoo requested review from a team, HydrionBurst and rco-odoo and removed request for a team November 10, 2025 09:35
Copy link
Contributor

@qsm-odoo qsm-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robodoo
Copy link
Collaborator

robodoo commented Nov 10, 2025

@qsm-odoo linked pull request(s) odoo/design-themes#1175, odoo/enterprise#98530, odoo/odoo#233899 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit to odoo/odoo that referenced this pull request Nov 10, 2025
*: test_website, base, web_editor, website, website_blog, website_event,
   website_event_track, website_payment, website_sale, test_assetsbundle

Before this commit when a module was updated all ir.asset records were
reset to their defined `active` state, if defined.
This causes assets related to old snippet versions to be made inactive
even if those old snippet versions are used inside existing pages.

It used to work when the activation of assets was made through view
inheritance because when views are defined through a `<template>` tag,
the `active` attribute is in fact ignored during updates since [1],
except for new records since [2].

This commit introduces an `<asset>` tag in the XML import format.
It is an alias of `<record ... model="ir.asset">` with the additional
feature that it avoids taking the `active` field into account during
updates for existing `ir_asset` records, just like `<template>` if the
`active` field is mentioned as attribute of the tag.
We then rely on the `website_disable_unused_snippets_assets` cron to
properly disable any unused asset at a later stage (note that the bug
being fixed here was mitigated by the fact that cron also re-enabled
assets which were disabled by mistake... but that might happen only a
few days later).

Another approach was to overload `_load_records_write` in `base`'s
`ir_asset.py` to avoid taking the `active` field into account when
updating records:
```py
    def _load_records_write(self, values):
        values.pop('active', None)
        super()._load_records_write(values)
```
But this is not as stable because it changes the way `ir.asset` records
are imported when the `<record>` tag is used. In the end we chose to be
consistent and do exactly the same as `<template>`, as this also allows
more and should be entirely stable.

[1]: 2d296cb#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR803-R804
[2]: f1c70d4#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR801-R804

task-2963840

closes #233899

X-original-commit: 40b442f
Related: odoo/enterprise#98530
Related: odoo/documentation#15069
Related: odoo/design-themes#1175
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
robodoo pushed a commit to odoo/design-themes that referenced this pull request Nov 10, 2025
*: theme_anelusia, theme_artists, theme_avantgarde,
   theme_aviato, theme_beauty, theme_bewise, theme_bistro,
   theme_bookstore, theme_buzzy, theme_clean, theme_cobalt,
   theme_enark, theme_graphene, theme_kea, theme_kiddo,
   theme_loftspace, theme_monglia, theme_nano, theme_notes,
   theme_odoo_experts, theme_orchid, theme_paptic,
   theme_real_estate, theme_test_custo, theme_treehouse,
   theme_vehicle, theme_yes, theme_zap

See community commit for details.

task-2963840

closes #1175

X-original-commit: 1bc54c9
Related: odoo/odoo#233899
Related: odoo/enterprise#98530
Related: odoo/documentation#15069
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
robodoo pushed a commit that referenced this pull request Nov 10, 2025
Also removes outdated things in the `<template>` tag documentation and
reviews it a bit.

See odoo/odoo#104836

task-2963840

closes #15069

X-original-commit: e69b371
Related: odoo/odoo#233899
Related: odoo/enterprise#98530
Related: odoo/design-themes#1175
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
@robodoo robodoo closed this Nov 10, 2025
@qsm-odoo qsm-odoo deleted the saas-18.3-15.0-assets_ignore_active-bso-473394-fw branch November 10, 2025 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants