From 34829862729f8065ec4137b34596e37d35fb0bec Mon Sep 17 00:00:00 2001 From: natuan9 Date: Tue, 5 Nov 2024 17:25:08 +0700 Subject: [PATCH] [MIG] document_page: migration Browse Wiki Content to 17.0 --- document_page/__manifest__.py | 2 ++ document_page/models/document_page.py | 2 +- .../static/src/js/document_page_kanban.js | 26 -------------- .../js/document_page_kanban_controller.esm.js | 19 +++++++++++ .../src/js/document_page_kanban_view.esm.js | 11 ++++++ document_page/views/document_page.xml | 7 +++- .../views/document_page_category.xml | 34 +++++-------------- 7 files changed, 47 insertions(+), 54 deletions(-) delete mode 100644 document_page/static/src/js/document_page_kanban.js create mode 100644 document_page/static/src/js/document_page_kanban_controller.esm.js create mode 100644 document_page/static/src/js/document_page_kanban_view.esm.js diff --git a/document_page/__manifest__.py b/document_page/__manifest__.py index ce6b3141..7bfe325d 100644 --- a/document_page/__manifest__.py +++ b/document_page/__manifest__.py @@ -32,6 +32,8 @@ "assets": { "web.assets_backend": [ "document_page/static/src/scss/document_page.scss", + "document_page/static/src/js/document_page_kanban_controller.esm.js", + "document_page/static/src/js/document_page_kanban_view.esm.js", ], }, } diff --git a/document_page/models/document_page.py b/document_page/models/document_page.py index cd380eba..a85c863d 100644 --- a/document_page/models/document_page.py +++ b/document_page/models/document_page.py @@ -94,7 +94,7 @@ class DocumentPage(models.Model): compute="_compute_backend_url", ) - image = fields.Binary("Image", attachment=True) + image = fields.Binary(attachment=True) color = fields.Integer(string="Color Index") @api.depends("menu_id", "parent_id.menu_id") diff --git a/document_page/static/src/js/document_page_kanban.js b/document_page/static/src/js/document_page_kanban.js deleted file mode 100644 index 7c95985c..00000000 --- a/document_page/static/src/js/document_page_kanban.js +++ /dev/null @@ -1,26 +0,0 @@ -odoo.define("document_page.update_kanban", function (require) { - "use strict"; - - var KanbanRecord = require("web.KanbanRecord"); - - KanbanRecord.include({ - // -------------------------------------------------------------------------- - // Private - // -------------------------------------------------------------------------- - - /** - * @override - * @private - */ - _openRecord: function () { - if ( - this.modelName === "document.page" && - this.$(".o_document_page_kanban_boxes a").length - ) { - this.$(".o_document_page_kanban_boxes a").first().click(); - } else { - this._super.apply(this, arguments); - } - }, - }); -}); diff --git a/document_page/static/src/js/document_page_kanban_controller.esm.js b/document_page/static/src/js/document_page_kanban_controller.esm.js new file mode 100644 index 00000000..0b7884cb --- /dev/null +++ b/document_page/static/src/js/document_page_kanban_controller.esm.js @@ -0,0 +1,19 @@ +/** @odoo-module **/ +import {KanbanController} from "@web/views/kanban/kanban_controller"; + +export class DocumentPageKanbanController extends KanbanController { + /** + * @param {Object} record + */ + async openRecord(record) { + const element = document.querySelector( + `.o_kanban_record[data-id="${record.id}"] .o_document_page_kanban_boxes a` + ); + + if (this.props.resModel === "document.page" && element) { + element.click(); + } else { + await super.openRecord(record); + } + } +} diff --git a/document_page/static/src/js/document_page_kanban_view.esm.js b/document_page/static/src/js/document_page_kanban_view.esm.js new file mode 100644 index 00000000..957bef03 --- /dev/null +++ b/document_page/static/src/js/document_page_kanban_view.esm.js @@ -0,0 +1,11 @@ +/** @odoo-module **/ +import {registry} from "@web/core/registry"; +import {kanbanView} from "@web/views/kanban/kanban_view"; +import {DocumentPageKanbanController} from "./document_page_kanban_controller.esm"; + +export const documentPageKanbanView = { + ...kanbanView, + Controller: DocumentPageKanbanController, +}; + +registry.category("views").add("document_page_kanban_view", documentPageKanbanView); diff --git a/document_page/views/document_page.xml b/document_page/views/document_page.xml index 05440e87..c8248475 100644 --- a/document_page/views/document_page.xml +++ b/document_page/views/document_page.xml @@ -45,7 +45,12 @@ /> - +

diff --git a/document_page/views/document_page_category.xml b/document_page/views/document_page_category.xml index 20cae216..3bbac5c0 100644 --- a/document_page/views/document_page_category.xml +++ b/document_page/views/document_page_category.xml @@ -94,7 +94,7 @@ document.page.browse.kanban document.page - + @@ -149,35 +149,13 @@

- +
@@ -216,6 +194,10 @@
+ + +
    + @@ -300,7 +282,7 @@ />