Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] data_validation: prevent icon overlap #4151

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 29, 2024

Description:

A same cell could have a data validation icon and a filter icon at
the same time, possibly causing overlap.

This commit disable the data validation icons on cells that have a
filter icon.

Note: for future work (in master), it'd be nice if we could create
a generic way to display a grid icon that would ensure that there is
no two icons on the same cell, and not handle them on a case by case
basis.

Task: : 3684182

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #4085

@robodoo
Copy link
Collaborator

robodoo commented Apr 29, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 29, 2024

@hokolomopo @pro-odoo cherrypicking of pull request #4085 failed.

stdout:

CONFLICT (file location): tests/data_filter/filter_icon_overlay.test.ts added in a991661c8 ([MOV] filter_icon_overlay: move tests to correct folder) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to tests/table/filter_icon_overlay.test.ts.

stderr:

11:27:58.266038 git.c:463               trace: built-in: git cherry-pick a991661c80d9f5e8d065a3eebe38c1fb286b50ab
error: could not apply a991661c8... [MOV] filter_icon_overlay: move tests to correct folder
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

@hokolomopo hokolomopo force-pushed the saas-17.2-17.0-data-validation-icon-filter-icon-adrm-qrGb-fw branch from 2199140 to df3f417 Compare April 29, 2024 10:46
@hokolomopo
Copy link
Contributor

@robodoo r+

A same cell could have a data validation icon and a filter icon at
the same time, possibly causing overlap.

This commit disable the data validation icons on cells that have a
filter icon.

Note: for future work (in master), it'd be nice if we could create
a generic way to display a grid icon that would ensure that there is
no two icons on the same cell, and not handle them on a case by case
basis.

Task: 3684182
@hokolomopo hokolomopo force-pushed the saas-17.2-17.0-data-validation-icon-filter-icon-adrm-qrGb-fw branch from df3f417 to 411800b Compare April 30, 2024 13:17
@hokolomopo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 30, 2024
robodoo pushed a commit that referenced this pull request Apr 30, 2024
A same cell could have a data validation icon and a filter icon at
the same time, possibly causing overlap.

This commit disable the data validation icons on cells that have a
filter icon.

Note: for future work (in master), it'd be nice if we could create
a generic way to display a grid icon that would ensure that there is
no two icons on the same cell, and not handle them on a case by case
basis.

closes #4151

Task: 3684182
Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
Signed-off-by: Adrien Minne (adrm) <adrm@odoo.com>
@robodoo robodoo closed this Apr 30, 2024
@fw-bot fw-bot deleted the saas-17.2-17.0-data-validation-icon-filter-icon-adrm-qrGb-fw branch May 14, 2024 13:46
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.

None yet

3 participants