+
+
+
-
-
-
-
- View
+
-
- Statements
- Statements
-
-
- Cust. Payments
-
-
- Vendor Payments
-
-
-
- Journal Items
+
+
-
+
+ Reconciliation
+
+
-
- New
+
+
+
-
- Cust. Payment
+
+
-
- Vendor Payment
-
-
- Internal Transfer
+
+
-
+
+ Reporting
+
+
-
- Reconciliation
+
+
-
-
+
-
-
-
-
-
- View
+
+
-
-
+ New
+
+
+ Journal Entry
+
- Credit Notes
- Refund
-
-
- Journal Items
+
+
-
+
+ Operations
+
+
+ Post All Entries
+
-
- New
-
-
-
-
-
+
-
+
-
- Reporting
+
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 9208ff7e8f9..289e4886818 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -554,6 +554,11 @@
sum_field="expected_revenue" recurring_revenue_sum_field="recurring_revenue_monthly"
help="This bar allows to filter the opportunities based on scheduled activities."/>
+
+ Edit
+ Delete
+
+
+ Configuration
+
-
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index 518dfa45805..054b1be5c8b 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -288,17 +288,12 @@
+
+ Edit Contract
+ Delete
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
- New
-
-
- Journal Entry
-
-
-
-
- Operations
-
-
- Post All Entries
-
-
-
-
-
-
-
-
-
-
- Configuration
-
-
@@ -562,16 +567,6 @@
Lost
-
-
-
-
-
-
-
![img]()
diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml
index cb2cc231935..39055aab135 100644
--- a/addons/hr/views/hr_department_views.xml
+++ b/addons/hr/views/hr_department_views.xml
@@ -77,6 +77,17 @@
+
+
-
-
-
-
-
-
+
+ Configuration
+
+
+
+ Reporting
+
+
@@ -88,9 +99,6 @@
@@ -107,17 +115,6 @@
-
-
-
-
-
-
diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml
index e4982e4b2d3..d2e99f7a972 100644
--- a/addons/hr_holidays/views/hr_leave_allocation_views.xml
+++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml
@@ -358,6 +358,10 @@
+
+ Edit Allocation
+ Delete
+
@@ -373,15 +377,6 @@
-
-
-
-
-
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index 69e07f033be..0758902de5c 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -106,6 +106,10 @@
+
+ Edit Time Off
+ Delete
+
@@ -115,15 +119,6 @@
-
-
-
-
-
from
+
+ Delete
+ Schedule Interview
+
+
+
+
diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index 1823c278ac1..7007f564c20 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -213,6 +213,14 @@
+
-
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index e56d7434b33..f067dd22fe4 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -82,23 +82,18 @@
+
+
+ Edit
+
+
+ Delete
+
+
+
-
-
-
-
-
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml
index e3b338e1864..5a20a8e04e9 100644
--- a/addons/hr_recruitment/views/hr_job_views.xml
+++ b/addons/hr_recruitment/views/hr_job_views.xml
@@ -26,6 +26,52 @@
+
+
-
+
+
+
+
+
+
+
+ New
+
+
+ Application
+
+
+
+
+ Reporting
+
+
+ Analysis
+
+
+
+
+
+
+
@@ -44,9 +90,6 @@
@@ -77,50 +120,6 @@
-
+
+ Download
+ Delete
+
diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml
index 2512813ae7e..05e442a77a6 100644
--- a/addons/note/views/note_views.xml
+++ b/addons/note/views/note_views.xml
@@ -90,6 +90,10 @@
+
+ Delete
+
diff --git a/addons/project/static/tests/tours/project_burndown_chart_tour.js b/addons/project/static/tests/tours/project_burndown_chart_tour.js
index ddf60691836..804d62dddb2 100644
--- a/addons/project/static/tests/tours/project_burndown_chart_tour.js
+++ b/addons/project/static/tests/tours/project_burndown_chart_tour.js
@@ -10,7 +10,7 @@ tour.register('burndown_chart_tour', {
trigger: '.o_app[data-menu-xmlid="project.menu_main_pm"]',
}, {
content: 'Open "Burndown Chart Test" project menu',
- trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_kanban_manage_toggle_button',
+ trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_dropdown_kanban .dropdown-toggle',
}, {
content: `Open "Burndown Chart Test" project's "Burndown Chart" view`,
trigger: '.o_kanban_record:contains("Burndown Chart Test") .o_kanban_manage_reporting div[role="menuitem"] a:contains("Burndown Chart")',
diff --git a/addons/project/static/tests/tours/project_sharing_tour.js b/addons/project/static/tests/tours/project_sharing_tour.js
index 0a0a83d1c0d..e22528aa7c3 100644
--- a/addons/project/static/tests/tours/project_sharing_tour.js
+++ b/addons/project/static/tests/tours/project_sharing_tour.js
@@ -3,7 +3,7 @@
import tour from 'web_tour.tour';
const projectSharingSteps = [...tour.stepUtils.goToAppSteps("project.menu_main_pm", 'Go to the Project App.'), {
- trigger: '.oe_kanban_global_click :contains("Project Sharing") button.o_dropdown_kanban',
+ trigger: '.o_kanban_record:contains("Project Sharing") .o_dropdown_kanban .dropdown-toggle',
content: 'Open the project dropdown.'
}, {
trigger: '.o_kanban_record:contains("Project Sharing") .dropdown-menu a:contains("Share")',
diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml
index b63f777f5d4..4088cf05dbe 100644
--- a/addons/project/views/project_sharing_views.xml
+++ b/addons/project/views/project_sharing_views.xml
@@ -48,6 +48,11 @@
+
+ Edit
+
+
+
+
-
-
-
-
+
+ Set Cover Image
+ Share
+ Edit
+
+
+
+
diff --git a/addons/stock/views/stock_picking_type_views.xml b/addons/stock/views/stock_picking_type_views.xml
index bea8dabdc59..e3b90803b9d 100644
--- a/addons/stock/views/stock_picking_type_views.xml
+++ b/addons/stock/views/stock_picking_type_views.xml
@@ -138,6 +138,50 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml
index 5034f8debad..2bfddd213c0 100644
--- a/addons/point_of_sale/views/point_of_sale_dashboard.xml
+++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml
@@ -62,6 +62,37 @@
+
+
+
-
@@ -85,9 +116,6 @@
@@ -130,34 +158,6 @@
-
@@ -73,16 +78,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -859,49 +901,6 @@
@@ -1453,18 +1459,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+ View
+
+
+
+
+ New
+
+
+
+
+ Reporting
+
+
+
+
+
+
+
+ Configuration
+
+
@@ -177,34 +205,6 @@
+
+
+
+
+
+
+
+
+
+
+
+ Configuration
+
+
@@ -152,9 +196,6 @@
@@ -198,48 +239,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/web/static/src/views/kanban/kanban_renderer.xml b/addons/web/static/src/views/kanban/kanban_renderer.xml
index daf8ebef9c0..414c3a5f421 100644
--- a/addons/web/static/src/views/kanban/kanban_renderer.xml
+++ b/addons/web/static/src/views/kanban/kanban_renderer.xml
@@ -155,7 +155,12 @@
-
-
-
-
-
diff --git a/addons/web/static/src/views/kanban/kanban_arch_parser.js b/addons/web/static/src/views/kanban/kanban_arch_parser.js
index a7474de85c8..333623b5eab 100644
--- a/addons/web/static/src/views/kanban/kanban_arch_parser.js
+++ b/addons/web/static/src/views/kanban/kanban_arch_parser.js
@@ -25,6 +25,7 @@ import { Widget } from "@web/views/widgets/widget";
*/
export const KANBAN_BOX_ATTRIBUTE = "kanban-box";
+export const KANBAN_MENU_ATTRIBUTE = "kanban-menu";
export const KANBAN_TOOLTIP_ATTRIBUTE = "kanban-tooltip";
export class KanbanArchParser extends XMLParser {
diff --git a/addons/web/static/src/views/kanban/kanban_compiler.js b/addons/web/static/src/views/kanban/kanban_compiler.js
index 83409b89556..0cbf293fb04 100644
--- a/addons/web/static/src/views/kanban/kanban_compiler.js
+++ b/addons/web/static/src/views/kanban/kanban_compiler.js
@@ -21,78 +21,13 @@ import { toInterpolatedStringExpression, ViewCompiler } from "@web/views/view_co
const ACTION_TYPES = ["action", "object"];
const SPECIAL_TYPES = [...ACTION_TYPES, "edit", "open", "delete", "url", "set_cover"];
-let currentDropdownId = 1;
export class KanbanCompiler extends ViewCompiler {
setup() {
this.ctx.readonly = "read_only_mode";
this.compilers.push(
{ selector: ".oe_kanban_colorpicker", fn: this.compileColorPicker },
- {
- selector: ".dropdown:not(.kanban_ignore_dropdown),.o_kanban_manage_button_section",
- fn: this.compileDropdown,
- doNotCopyAttributes: true,
- },
- {
- selector: ".dropdown-menu:not(.kanban_ignore_dropdown)",
- fn: this.compileDropdownMenu,
- doNotCopyAttributes: true,
- },
- {
- selector:
- ".dropdown-toggle:not(.kanban_ignore_dropdown),.o_kanban_manage_toggle_button",
- fn: this.compileDropdownToggler,
- doNotCopyAttributes: true,
- },
{ selector: "t[t-call]", fn: this.compileTCall }
);
- /** @type {Record} */
- this.dropdowns = {};
- }
-
- /**
- * Renders a Dropdown component node definition object. It works as follows:
- *
- * The first time a node defining a dropdown component or component slot (dropdown
- * root, toggler or default=menu), a new dropdown object will be generated,
- * taking note of what parts have already been defined.
- *
- * It also creates the Dropdown component node that will be inserted in the
- * template, at the position of the first node defining either the root dropdown
- * or the dropdown toggler.
- *
- * Each next component or slot still not defined on the current dropdown object
- * will be added to it.
- *
- * If a duplicate part or component is found, a new dropdown object is created
- * and set as the new current dropdown.
- *
- * @param {"dropdown" | "toggler" | "menu"} part
- * @returns {DropdownDef}
- */
- renderDropdown(part) {
- if (!this.dropdowns[currentDropdownId]) {
- this.dropdowns[currentDropdownId] = {
- parts: [],
- inserted: false,
- shouldInsert: false,
- el: createElement("Dropdown", {
- class: toStringExpression("o_dropdown_kanban"),
- position: toStringExpression("bottom-end"),
- }),
- };
- }
- const dropdown = this.dropdowns[currentDropdownId];
- if (dropdown.parts.includes(part)) {
- // Duplicate part: generate new dropdown
- currentDropdownId++;
- return this.renderDropdown(part);
- }
- dropdown.parts.push(part);
- if (part !== "menu" || dropdown.parts.includes("dropdown")) {
- dropdown.shouldInsert = !dropdown.inserted;
- dropdown.inserted = true;
- }
- return dropdown;
}
//-----------------------------------------------------------------------------
@@ -168,65 +103,6 @@ export class KanbanCompiler extends ViewCompiler {
return createElement("t", { "t-call": "web.KanbanColorPicker" });
}
- /**
- * @param {Element} el
- * @param {Object} params
- * @returns {Element | null}
- */
- compileDropdown(el, params) {
- const { shouldInsert, el: dropdownEl } = this.renderDropdown("dropdown");
- const classes = [...el.classList].filter((cls) => cls && cls !== "dropdown").join(" ");
-
- combineAttributes(dropdownEl, "class", toStringExpression(classes), "+' '+");
-
- for (const child of el.childNodes) {
- append(dropdownEl, this.compileNode(child, params));
- }
-
- return shouldInsert && dropdownEl;
- }
-
- /**
- * @param {Element} el
- * @param {Object} params
- * @returns {Element | null}
- */
- compileDropdownMenu(el, params) {
- const { shouldInsert, el: dropdownEl } = this.renderDropdown("menu");
- const cls = el.getAttribute("class") || "";
-
- combineAttributes(dropdownEl, "menuClass", toStringExpression(cls), "+' '+");
- const wrapper = createElement("KanbanDropdownMenuWrapper");
-
- for (const child of el.childNodes) {
- append(wrapper, this.compileNode(child, params));
- }
-
- append(dropdownEl, wrapper);
-
- return shouldInsert && dropdownEl;
- }
-
- /**
- * @param {Element} el
- * @param {Object} params
- * @returns {Element | null}
- */
- compileDropdownToggler(el, params) {
- const { shouldInsert, el: dropdownEl } = this.renderDropdown("toggler");
- const classes = ["btn", ...el.classList].filter(Boolean).join(" ");
- const togglerSlot = createElement("t", { "t-set-slot": "toggler" });
-
- combineAttributes(dropdownEl, "togglerClass", toStringExpression(classes), "+' '+");
-
- for (const child of el.childNodes) {
- append(togglerSlot, this.compileNode(child, params));
- }
- append(dropdownEl, togglerSlot);
-
- return shouldInsert && dropdownEl;
- }
-
/**
* @override
*/
diff --git a/addons/web/static/src/views/kanban/kanban_controller.scss b/addons/web/static/src/views/kanban/kanban_controller.scss
index e0df34aca89..1af7bb3c790 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.scss
+++ b/addons/web/static/src/views/kanban/kanban_controller.scss
@@ -26,17 +26,12 @@
--o-view-nocontent-zindex: 1;
// ----------------------------------------------------------------------------
- .dropdown,
- .o_kanban_manage_button_section {
- position: inherit;
- }
-
@include media-breakpoint-down(md) {
--KanbanRecord-padding-h: #{$o-kanban-inside-hgutter * 2};
padding: 0px !important;
}
- .o_kanban_record > div,
+ .o_kanban_record > div:not(.o_dropdown_kanban),
.o_kanban_quick_create {
border: 1px solid $border-color;
background-color: $o-view-background-color;
@@ -57,7 +52,7 @@
min-width: 150px;
margin: 0 0 -1px;
- > div {
+ > div:not(.o_dropdown_kanban) {
padding: var(--KanbanRecord-padding-v) var(--KanbanRecord-padding-h);
width: 100%;
height: 100%;
@@ -258,13 +253,7 @@
// ------- v11 Layout + generic layouts (~v10) -------
// Kanban Record - Dropdown
.o_dropdown_kanban {
- @include o-position-absolute(
- calc(var(--KanbanRecord-padding-v) + var(--KanbanRecord__dropdown-gap)),
- calc(var(--KanbanRecord-padding-h) + var(--KanbanRecord__dropdown-gap))
- );
visibility: hidden;
- margin: calc(var(--KanbanRecord-padding-v) * -1)
- calc(var(--KanbanRecord-padding-h) * -1) 0 0;
@include media-breakpoint-down(md) {
visibility: visible;
}
diff --git a/addons/web/static/src/views/kanban/kanban_dashboard.scss b/addons/web/static/src/views/kanban/kanban_dashboard.scss
index 2aaf21e25f3..9c5c54e18e3 100644
--- a/addons/web/static/src/views/kanban/kanban_dashboard.scss
+++ b/addons/web/static/src/views/kanban/kanban_dashboard.scss
@@ -8,7 +8,7 @@
--KanbanRecord__dropdown-gap: 0px;
// ----------------------------------------------------------------------------
- .o_kanban_record > div {
+ .o_kanban_record > div:not(.o_dropdown_kanban) {
position: relative;
display: flex;
flex-flow: column nowrap;
@@ -24,108 +24,6 @@
max-width: none;
}
- // ------- Dropdown toggle & menu -------
- $o-kanban-manage-toggle-height: 35px;
-
- .o_dropdown_kanban {
- visibility: visible;
- }
-
- .o_kanban_manage_toggle_button {
- @include o-kanban-dropdown($o-kanban-dashboard-hpadding);
- @include o-position-absolute(0, 0);
- height: $o-kanban-manage-toggle-height;
- }
-
- .o_kanban_card_manage_pane {
- // Arbitrary value to place the dropdown-menu exactly below the
- // dropdown-toggle (height is forced so that it works on Firefox)
- top: $o-kanban-manage-toggle-height;
-
- > div:not(.o_no_padding_kanban_colorpicker) {
- padding: 3px 0 3px 20px;
- visibility: visible;
- margin-bottom: 5px;
- }
-
- > .o_kanban_card_manage_section {
- margin-bottom: 10px;
-
- + .o_kanban_card_manage_section {
- border-top: 1px solid map-get($grays, '200');
- }
-
- > div {
- @include o-kanban-dashboard-dropdown-link;
- }
- }
-
- // Dropdown menu with complex layout
- &.container {
- width: 95%;
- max-width: 400px;
-
- .row {
- display: flex;
- flex-flow: row nowrap;
- justify-content: space-between;
- margin-left: 0;
- margin-right: 0;
- padding-left: $o-kanban-dashboard-dropdown-complex-gap*2;
- padding-right: $o-kanban-dashboard-dropdown-complex-gap*2;
- }
-
- div[class*="col-"] {
- flex: 1 1 percentage(1/3);
- padding-left: $o-kanban-dashboard-dropdown-complex-gap;
- padding-right: $o-kanban-dashboard-dropdown-complex-gap;
- max-width: none;
-
- > .o_kanban_card_manage_title {
- @extend .h5;
- margin: (($font-size-base * $line-height-base) / 2) 0;
- }
- > div:not(.o_kanban_card_manage_title) {
- @include o-kanban-dashboard-dropdown-link($link-padding-gap: $o-kanban-dashboard-dropdown-complex-gap);
- }
- }
-
- .row.o_kanban_card_manage_settings {
- padding-top: $o-kanban-dashboard-dropdown-complex-gap*3;
-
- &:not(:first-child) {
- border-top: 1px solid map-get($grays, '300');
- }
-
- .oe_kanban_colorpicker {
- max-width: none;
- padding: 0;
- }
-
- div[class*="col-"] + div[class*="col-"] {
- border-left: 1px solid map-get($grays, '300');
- }
- > div:last-child {
- @include o-kanban-dashboard-dropdown-link($link-padding-gap: $o-kanban-dashboard-dropdown-complex-gap);
- padding-left: $dropdown-item-padding-x;
- padding-right: $dropdown-item-padding-x;
- }
- }
- }
-
- }
-
- &.o_dropdown_open,
- .o-dropdown.show {
- .o_kanban_card_manage_pane {
- display: block;
- }
- .o_kanban_manage_toggle_button {
- @include o-kanban-dropdown-open;
- position: absolute;
- }
- }
-
// ------- Kanban Record Titles -------
// Uniform design across different HTML layouts
@@ -204,6 +102,90 @@
}
}
+ // ------- Dropdown toggle & menu -------
+ $o-kanban-manage-toggle-height: 35px;
+
+ .o_kanban_record .o_dropdown_kanban {
+ visibility: visible;
+ }
+
+ .o_kanban_record .dropdown-menu {
+ // Arbitrary value to place the dropdown-menu exactly below the
+ // dropdown-toggle (height is forced so that it works on Firefox)
+ top: $o-kanban-manage-toggle-height;
+
+ > div:not(.o_no_padding_kanban_colorpicker) {
+ padding: 3px 0 3px 20px;
+ visibility: visible;
+ margin-bottom: 5px;
+ }
+
+ > .o_kanban_card_manage_section {
+ margin-bottom: 10px;
+
+ + .o_kanban_card_manage_section {
+ border-top: 1px solid map-get($grays, '200');
+ }
+
+ > div {
+ @include o-kanban-dashboard-dropdown-link;
+ }
+ }
+
+ // Dropdown menu with complex layout
+ .container {
+ max-width: 400px;
+ margin-left: 0;
+ margin-right: 0;
+
+ .row {
+ display: flex;
+ flex-flow: row nowrap;
+ justify-content: space-between;
+ padding-left: $o-kanban-dashboard-dropdown-complex-gap*2;
+ padding-right: $o-kanban-dashboard-dropdown-complex-gap*2;
+ }
+
+ div[class*="col-"] {
+ flex: 1 1 percentage(1/3);
+ padding-left: $o-kanban-dashboard-dropdown-complex-gap;
+ padding-right: $o-kanban-dashboard-dropdown-complex-gap;
+ max-width: none;
+
+ > .o_kanban_card_manage_title {
+ @extend .h5;
+ margin: (($font-size-base * $line-height-base) / 2) 0;
+ }
+ > div:not(.o_kanban_card_manage_title) {
+ @include o-kanban-dashboard-dropdown-link($link-padding-gap: $o-kanban-dashboard-dropdown-complex-gap);
+ }
+ }
+
+ .row.o_kanban_card_manage_settings {
+ padding-top: $o-kanban-dashboard-dropdown-complex-gap*3;
+
+ &:not(:first-child) {
+ border-top: 1px solid map-get($grays, '300');
+ }
+
+ .oe_kanban_colorpicker {
+ max-width: none;
+ padding: 0;
+ }
+
+ div[class*="col-"] + div[class*="col-"] {
+ border-left: 1px solid map-get($grays, '300');
+ }
+ > div:last-child {
+ @include o-kanban-dashboard-dropdown-link($link-padding-gap: $o-kanban-dashboard-dropdown-complex-gap);
+ padding-left: $dropdown-item-padding-x;
+ padding-right: $dropdown-item-padding-x;
+ }
+ }
+ }
+
+ }
+
.o_favorite {
@include o-position-absolute(
$top: 3px,
diff --git a/addons/web/static/src/views/kanban/kanban_record.js b/addons/web/static/src/views/kanban/kanban_record.js
index 7f845060db9..165890e73a0 100644
--- a/addons/web/static/src/views/kanban/kanban_record.js
+++ b/addons/web/static/src/views/kanban/kanban_record.js
@@ -14,7 +14,11 @@ import { ViewButton } from "@web/views/view_button/view_button";
import { useViewCompiler } from "@web/views/view_compiler";
import { Widget } from "@web/views/widgets/widget";
import { evalDomain } from "../utils";
-import { KANBAN_BOX_ATTRIBUTE, KANBAN_TOOLTIP_ATTRIBUTE } from "./kanban_arch_parser";
+import {
+ KANBAN_BOX_ATTRIBUTE,
+ KANBAN_MENU_ATTRIBUTE,
+ KANBAN_TOOLTIP_ATTRIBUTE,
+} from "./kanban_arch_parser";
import { KanbanCompiler } from "./kanban_compiler";
import { KanbanCoverImageDialog } from "./kanban_cover_image_dialog";
import { KanbanDropdownMenuWrapper } from "./kanban_dropdown_menu_wrapper";
@@ -122,6 +126,10 @@ export class KanbanRecord extends Component {
this.templates = useViewCompiler(ViewCompiler, arch, templates);
+ if (this.constructor.KANBAN_MENU_ATTRIBUTE in templates) {
+ this.showMenu = true;
+ }
+
if (KANBAN_TOOLTIP_ATTRIBUTE in templates) {
useTooltip("root", {
info: { ...this, record: this.props.record.formattedRecord },
@@ -327,4 +335,6 @@ KanbanRecord.props = [
];
KanbanRecord.Compiler = KanbanCompiler;
KanbanRecord.KANBAN_BOX_ATTRIBUTE = KANBAN_BOX_ATTRIBUTE;
+KanbanRecord.KANBAN_MENU_ATTRIBUTE = KANBAN_MENU_ATTRIBUTE;
+KanbanRecord.menuTemplate = "web.KanbanRecordMenu";
KanbanRecord.template = "web.KanbanRecord";
diff --git a/addons/web/static/src/views/kanban/kanban_record.xml b/addons/web/static/src/views/kanban/kanban_record.xml
index 8dda8bec1e0..6ff60900c1e 100644
--- a/addons/web/static/src/views/kanban/kanban_record.xml
+++ b/addons/web/static/src/views/kanban/kanban_record.xml
@@ -10,6 +10,23 @@
t-on-click="onGlobalClick"
t-ref="root">
+ -
-
- diff --git a/addons/web/static/tests/views/kanban_view_tests.js b/addons/web/static/tests/views/kanban_view_tests.js index f4985f88e54..1432ced21d1 100644 --- a/addons/web/static/tests/views/kanban_view_tests.js +++ b/addons/web/static/tests/views/kanban_view_tests.js @@ -397,34 +397,6 @@ QUnit.module("Views", (hooks) => { assert.strictEqual(target.querySelector("span.o_text_block").textContent, "yop"); }); - QUnit.test("dropdown without toggler are correctly rendered", async (assert) => { - serverData.models.partner.records = [serverData.models.partner.records[0]]; - await makeView({ - type: "kanban", - resModel: "partner", - serverData, - arch: ` -
-
-
-
-
- " +
- '" +
- '' +
- ' " +
- " " +
- "",
+ arch: `
+
+
+
+
+
+
+
+
+ `,
async mockRPC(route, { method, args }) {
if (method === "write") {
assert.step(`write-color-${args[1].color}`);
@@ -9840,27 +9805,22 @@ QUnit.module("Views", (hooks) => {
type: "kanban",
resModel: "partner",
serverData,
- arch:
- "" +
- "" +
- '' +
- '" +
- " " +
- " " +
- " ",
+ arch: `
+
+
+
+ Set Cover Image
+
+
+
+
+ `,
async mockRPC(_route, { model, method, args }) {
if (model === "partner" && method === "write") {
assert.step(String(args[0][0]));
@@ -9912,7 +9872,7 @@ QUnit.module("Views", (hooks) => {
assert.containsOnce(target, 'img[data-src*="/web/image/2"]');
- await click(target, ".o_kanban_record:first-child .o_attachment_image");
+ // await click(target, ".o_kanban_record:first-child .o_attachment_image"); //Not sure, to discuss
assert.verifySteps(["1", "2"], "should writes on both kanban records");
});
@@ -10999,68 +10959,6 @@ QUnit.module("Views", (hooks) => {
assert.containsN(target, ".o_kanban_group:nth-child(2) .o_kanban_record", 3);
});
- QUnit.test("classes on dropdown menu do not end on dropdown main div", async (assert) => {
- serverData.models.partner.records.splice(1, 3); // keep one record only
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
-
-
-
- `,
- });
-
- const dropdown = target.querySelector(".o_kanban_record .o-dropdown");
- assert.isVisible(dropdown);
- assert.hasClass(dropdown, "o_dropdown_kanban");
- assert.doesNotHaveClass(dropdown, "dropdown-menu");
- assert.doesNotHaveClass(dropdown, "o_kanban_card_manage_pane");
- await click(dropdown, "button.dropdown-toggle");
- assert.containsOnce(dropdown, ".o_kanban_card_manage_pane.dropdown-menu");
- });
-
- QUnit.test("classes on toggler do not end on dropdown main div", async (assert) => {
- serverData.models.partner.records.splice(1, 3); // keep one record only
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
-
-
-
- `,
- });
-
- const dropdown = target.querySelector(".o_kanban_record .o-dropdown");
- assert.isVisible(dropdown);
- assert.hasClass(dropdown, "o_dropdown_kanban");
- assert.doesNotHaveClass(dropdown, "o_kanban_manage_toggle_button");
- assert.doesNotHaveClass(dropdown, "o_left");
- assert.containsOnce(dropdown, ".o_kanban_manage_toggle_button.o_left");
- });
-
QUnit.test("dropdown is closed on item click", async (assert) => {
serverData.models.partner.records.splice(1, 3); // keep one record only
await makeView({
@@ -11070,17 +10968,11 @@ QUnit.module("Views", (hooks) => {
arch: /* xml */ `
+
+ Item
+
-
@@ -11094,111 +10986,6 @@ QUnit.module("Views", (hooks) => {
assert.containsNone(target, ".dropdown-menu");
});
- QUnit.test(
- "classes on dropdown are on dropdown main div but not the other attributes",
- async (assert) => {
- serverData.models.partner.records.splice(1, 3); // keep one record only
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
-
-
-
- `,
- });
-
- const dropdown = target.querySelector(".o_kanban_record .o-dropdown");
- assert.isVisible(dropdown);
- assert.strictEqual(
- dropdown.className,
- "o-dropdown dropdown o_dropdown_kanban o_kanban_manage_button_section my_class o-dropdown--no-caret"
- );
- assert.notOk(dropdown.hasAttribute("placeholder"));
- }
- );
-
- QUnit.test("declaring only the menu does not insert a dropdown", async (assert) => {
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
-
-
-
- `,
- });
-
- assert.containsNone(target, ".o_kanban_record .o-dropdown");
- });
-
- QUnit.test("support multiple dropdowns", async (assert) => {
- assert.expect(4);
-
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
-
- `,
- });
-
- assert.containsN(target, ".o_kanban_renderer .dropdown-true", 3);
- assert.containsN(target, ".o_kanban_renderer .dropdown", 4);
-
- await toggleRecordDropdown(2);
-
- assert.strictEqual(getCardTexts()[2], "gnap\nTOGGLER TRUE\nMENU TRUE");
-
- await toggleRecordDropdown(3);
-
- assert.strictEqual(getCardTexts()[3], "blip\nTOGGLER FALSE\nMENU FALSE");
- });
-
QUnit.test("can use JSON in kanban template", async (assert) => {
serverData.models.partner.records = [{ id: 1, foo: '["g", "e", "d"]' }];
await makeView({
@@ -11223,37 +11010,6 @@ QUnit.module("Views", (hooks) => {
assert.strictEqual(target.querySelector(".o_kanban_record").innerText, "ged");
});
- QUnit.test("Dropdowns in subtemplates", async (assert) => {
- await makeView({
- type: "kanban",
- resModel: "partner",
- serverData,
- arch: /* xml */ `
-
-
-
- `,
- });
-
- assert.containsN(target, ".o_kanban_record .dropdown", 4);
-
- await toggleRecordDropdown(0);
-
- assert.strictEqual(getCardTexts()[0], "yop\nTOGGLER\nMENU");
- });
-
QUnit.test(
"Color '200' (gray) can be used twice (for false value and another value) in progress bar",
async (assert) => {
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index 625692201ad..9795ce65c64 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -43,20 +43,14 @@
+ View Track
+ Edit Track
+ Delete
+
' +
- '
" +
- "' +
- '' +
- '' +
- "" +
- '" +
- "
" +
- '
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TOGGLER TRUE
-
-
-
- TOGGLER FALSE
-
-
-
-
-
-
-
- TOGGLER
-
-
-
-
diff --git a/addons/website_slides/views/slide_channel_views.xml b/addons/website_slides/views/slide_channel_views.xml
index 72c041ffa19..0a8d8f43f62 100644
--- a/addons/website_slides/views/slide_channel_views.xml
+++ b/addons/website_slides/views/slide_channel_views.xml
@@ -243,28 +243,23 @@
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml
index fe5e755e855..2df17155b99 100644
--- a/odoo/addons/base/views/ir_module_views.xml
+++ b/odoo/addons/base/views/ir_module_views.xml
@@ -174,20 +174,15 @@
+
+ Module Info
+ Learn More
+ Upgrade
+ Uninstall
+