From fa50b892dfd08f69ed2f05e743fe21e28a155ec7 Mon Sep 17 00:00:00 2001 From: GuillemCForgeFlow Date: Mon, 26 Jun 2023 14:02:16 +0200 Subject: [PATCH 1/7] [ADD]web_archive_date Glue module between base_archive_date and web to display the Latest Archived Date and Latest Archived by on the metadata of a record. --- web_archive_date/__init__.py | 1 + web_archive_date/__manifest__.py | 19 +++++++++ web_archive_date/models/__init__.py | 1 + web_archive_date/models/base.py | 23 +++++++++++ web_archive_date/readme/CONTRIBUTORS.rst | 3 ++ web_archive_date/readme/DESCRIPTION.rst | 3 ++ web_archive_date/readme/ROADMAP.rst | 3 ++ web_archive_date/readme/USAGE.rst | 6 +++ web_archive_date/static/src/xml/debug.xml | 17 ++++++++ web_archive_date/tests/__init__.py | 1 + .../tests/test_web_archive_date.py | 40 +++++++++++++++++++ 11 files changed, 117 insertions(+) create mode 100644 web_archive_date/__init__.py create mode 100644 web_archive_date/__manifest__.py create mode 100644 web_archive_date/models/__init__.py create mode 100644 web_archive_date/models/base.py create mode 100644 web_archive_date/readme/CONTRIBUTORS.rst create mode 100644 web_archive_date/readme/DESCRIPTION.rst create mode 100644 web_archive_date/readme/ROADMAP.rst create mode 100644 web_archive_date/readme/USAGE.rst create mode 100644 web_archive_date/static/src/xml/debug.xml create mode 100644 web_archive_date/tests/__init__.py create mode 100644 web_archive_date/tests/test_web_archive_date.py diff --git a/web_archive_date/__init__.py b/web_archive_date/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/web_archive_date/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/web_archive_date/__manifest__.py b/web_archive_date/__manifest__.py new file mode 100644 index 0000000000..91a54414c2 --- /dev/null +++ b/web_archive_date/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2023 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +{ + "name": "Web Archive Date", + "summary": """ + Reflects the Latest Archived Date and Latest Archived by on the record metadata. + """, + "version": "13.0.1.0.0", + "category": "Usability", + "license": "AGPL-3", + "website": "https://github.com/OCA/server-ux", + "author": "ForgeFlow, Odoo Community Association (OCA)", + "depends": ["web", "base_archive_date"], + "maintainers": ["GuillemCForgeFlow"], + "qweb": ["static/src/xml/debug.xml"], + "installable": True, + "application": False, + "auto_install": True, +} diff --git a/web_archive_date/models/__init__.py b/web_archive_date/models/__init__.py new file mode 100644 index 0000000000..0e44449338 --- /dev/null +++ b/web_archive_date/models/__init__.py @@ -0,0 +1 @@ +from . import base diff --git a/web_archive_date/models/base.py b/web_archive_date/models/base.py new file mode 100644 index 0000000000..c7c7d8712a --- /dev/null +++ b/web_archive_date/models/base.py @@ -0,0 +1,23 @@ +# Copyright 2023 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo import models + +from odoo.addons.base_archive_date.models.base import LOG_ARCHIVE_DATE, LOG_ARCHIVE_UID + + +class Base(models.AbstractModel): + _inherit = "base" + + def get_metadata(self): + def merge_lists_of_dicts(original, new, key): + merged_dict = {} + for item in original: + merged_dict[item[key]] = item + for item in new: + merged_dict.setdefault(item[key], {}).update(item) + merged_list = list(merged_dict.values()) + return merged_list + + result = super(Base, self).get_metadata() + archive_dict = self.read([LOG_ARCHIVE_DATE, LOG_ARCHIVE_UID]) + return merge_lists_of_dicts(result, archive_dict, "id") diff --git a/web_archive_date/readme/CONTRIBUTORS.rst b/web_archive_date/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..a502d31e5b --- /dev/null +++ b/web_archive_date/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `ForgeFlow S.L. `_: + + * Guillem Casassas diff --git a/web_archive_date/readme/DESCRIPTION.rst b/web_archive_date/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..4ec4ffa3be --- /dev/null +++ b/web_archive_date/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Glue module between `web` and `base_archive_date`. + +This module adds the `Latest Archived Date:` and `Latest Archived by:` as fields showing in the metadata of a record. Just like the `Latest Modification Date:` (write_date) or the `Created by:` (create_uid). diff --git a/web_archive_date/readme/ROADMAP.rst b/web_archive_date/readme/ROADMAP.rst new file mode 100644 index 0000000000..99666376d6 --- /dev/null +++ b/web_archive_date/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +Format of `archive_date` is not the same as `write_date` shown in the metadata. Values are formatted in javascript. Can't inherit the method and adapt the value there. + +TO BE DONE: Check how to format the value in the QWeb view somehow. diff --git a/web_archive_date/readme/USAGE.rst b/web_archive_date/readme/USAGE.rst new file mode 100644 index 0000000000..9cc96ad5de --- /dev/null +++ b/web_archive_date/readme/USAGE.rst @@ -0,0 +1,6 @@ +#. Install the module, archive a record and show on the Metdata of the record and you'll +be able to see the `Latest Archived Date` `Latest Archived by` there. +#. To check the Metadata: +* Activate the Developer Mode. +* Click on the `bug`, once the markdown appears, click on the View Metadata button. +* You can check the `Latest Archived Date` and `Latest Archived by` value once the record has been archived previously. diff --git a/web_archive_date/static/src/xml/debug.xml b/web_archive_date/static/src/xml/debug.xml new file mode 100644 index 0000000000..271aba1128 --- /dev/null +++ b/web_archive_date/static/src/xml/debug.xml @@ -0,0 +1,17 @@ + + + diff --git a/web_archive_date/tests/__init__.py b/web_archive_date/tests/__init__.py new file mode 100644 index 0000000000..3fd0acab86 --- /dev/null +++ b/web_archive_date/tests/__init__.py @@ -0,0 +1 @@ +from . import test_web_archive_date diff --git a/web_archive_date/tests/test_web_archive_date.py b/web_archive_date/tests/test_web_archive_date.py new file mode 100644 index 0000000000..aa061d098b --- /dev/null +++ b/web_archive_date/tests/test_web_archive_date.py @@ -0,0 +1,40 @@ +# Copyright 2023 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.addons.base_archive_date.tests.test_base_archive_date import ( + TestBaseArchiveDate, +) + + +class TestWebArchiveDate(TestBaseArchiveDate): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + + def test_01_check_metadata_shown(self): + """ + Check that the method getting the metadata on a record, once it is archived. + """ + self.partner.toggle_active() + metadata = self.partner.get_metadata() + self.assertEqual(len(metadata), 1, "List should only contain one value.") + value = metadata[0] + self.assertTrue(value) + self.assertTrue( + "id" in value.keys() and self.partner.id == value.get("id"), + "Partner ID should be the value of the key ID in the dictionary.", + ) + self.assertTrue( + "archive_date" in value.keys() and "archive_uid" in value.keys() + ) + self.assertEqual( + value.get("archive_date"), + self.partner.archive_date, + "Value shown in the metadata view should be equal to the one set in the partner.", + ) + self.assertEqual( + value.get("archive_uid")[0], + self.partner.archive_uid.id, + "User ID shown used in the metadata should be the same as the archive_uid value.", + ) From 98420f4677b2347e1b93826571938765f1535d3b Mon Sep 17 00:00:00 2001 From: oca-ci Date: Thu, 29 Jun 2023 14:52:37 +0000 Subject: [PATCH 2/7] [UPD] Update web_archive_date.pot --- web_archive_date/i18n/web_archive_date.pot | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 web_archive_date/i18n/web_archive_date.pot diff --git a/web_archive_date/i18n/web_archive_date.pot b/web_archive_date/i18n/web_archive_date.pot new file mode 100644 index 0000000000..65fb87813c --- /dev/null +++ b/web_archive_date/i18n/web_archive_date.pot @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_archive_date +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: web_archive_date +#: model:ir.model,name:web_archive_date.model_base +msgid "Base" +msgstr "" + +#. module: web_archive_date +#. openerp-web +#: code:addons/web_archive_date/static/src/xml/debug.xml:0 +#, python-format +msgid "Latest Archived Date:" +msgstr "" + +#. module: web_archive_date +#. openerp-web +#: code:addons/web_archive_date/static/src/xml/debug.xml:0 +#, python-format +msgid "Latest Archived by:" +msgstr "" From 1073c1e9d45a5733a62c36fc969fe68aad4391f2 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 29 Jun 2023 14:57:03 +0000 Subject: [PATCH 3/7] [UPD] README.rst --- web_archive_date/README.rst | 102 ++++ .../static/description/index.html | 441 ++++++++++++++++++ 2 files changed, 543 insertions(+) create mode 100644 web_archive_date/README.rst create mode 100644 web_archive_date/static/description/index.html diff --git a/web_archive_date/README.rst b/web_archive_date/README.rst new file mode 100644 index 0000000000..22270e441b --- /dev/null +++ b/web_archive_date/README.rst @@ -0,0 +1,102 @@ +================ +Web Archive Date +================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github + :target: https://github.com/OCA/server-ux/tree/13.0/web_archive_date + :alt: OCA/server-ux +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-ux-13-0/server-ux-13-0-web_archive_date + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/250/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Glue module between `web` and `base_archive_date`. + +This module adds the `Latest Archived Date:` and `Latest Archived by:` as fields showing in the metadata of a record. Just like the `Latest Modification Date:` (write_date) or the `Created by:` (create_uid). + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +#. Install the module, archive a record and show on the Metdata of the record and you'll +be able to see the `Latest Archived Date` `Latest Archived by` there. +#. To check the Metadata: +* Activate the Developer Mode. +* Click on the `bug`, once the markdown appears, click on the View Metadata button. +* You can check the `Latest Archived Date` and `Latest Archived by` value once the record has been archived previously. + +Known issues / Roadmap +====================== + +Format of `archive_date` is not the same as `write_date` shown in the metadata. Values are formatted in javascript. Can't inherit the method and adapt the value there. + +TO BE DONE: Check how to format the value in the QWeb view somehow. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* `ForgeFlow S.L. `_: + + * Guillem Casassas + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-GuillemCForgeFlow| image:: https://github.com/GuillemCForgeFlow.png?size=40px + :target: https://github.com/GuillemCForgeFlow + :alt: GuillemCForgeFlow + +Current `maintainer `__: + +|maintainer-GuillemCForgeFlow| + +This module is part of the `OCA/server-ux `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_archive_date/static/description/index.html b/web_archive_date/static/description/index.html new file mode 100644 index 0000000000..526225eb85 --- /dev/null +++ b/web_archive_date/static/description/index.html @@ -0,0 +1,441 @@ + + + + + + +Web Archive Date + + + +
+

Web Archive Date

+ + +

Beta License: AGPL-3 OCA/server-ux Translate me on Weblate Try me on Runbot

+

Glue module between web and base_archive_date.

+

This module adds the Latest Archived Date: and Latest Archived by: as fields showing in the metadata of a record. Just like the Latest Modification Date: (write_date) or the Created by: (create_uid).

+

Table of contents

+ +
+

Usage

+

#. Install the module, archive a record and show on the Metdata of the record and you’ll +be able to see the Latest Archived Date Latest Archived by there. +#. To check the Metadata: +* Activate the Developer Mode. +* Click on the bug, once the markdown appears, click on the View Metadata button. +* You can check the Latest Archived Date and Latest Archived by value once the record has been archived previously.

+
+
+

Known issues / Roadmap

+

Format of archive_date is not the same as write_date shown in the metadata. Values are formatted in javascript. Can’t inherit the method and adapt the value there.

+

TO BE DONE: Check how to format the value in the QWeb view somehow.

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

GuillemCForgeFlow

+

This module is part of the OCA/server-ux project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 219a2b3b0289bc304c9dcb99340626c539b3d28e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 29 Jun 2023 14:57:03 +0000 Subject: [PATCH 4/7] [ADD] icon.png --- web_archive_date/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 web_archive_date/static/description/icon.png diff --git a/web_archive_date/static/description/icon.png b/web_archive_date/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 1c2ef442fe8d3583e47bd2d09b1be1ca5139749f Mon Sep 17 00:00:00 2001 From: GuillemCForgeFlow Date: Wed, 5 Jul 2023 09:17:22 +0200 Subject: [PATCH 5/7] [FIX]web_archive_date: ensure new archive fields in model --- web_archive_date/models/base.py | 7 ++++-- .../tests/test_web_archive_date.py | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/web_archive_date/models/base.py b/web_archive_date/models/base.py index c7c7d8712a..bcfbe558cc 100644 --- a/web_archive_date/models/base.py +++ b/web_archive_date/models/base.py @@ -19,5 +19,8 @@ def merge_lists_of_dicts(original, new, key): return merged_list result = super(Base, self).get_metadata() - archive_dict = self.read([LOG_ARCHIVE_DATE, LOG_ARCHIVE_UID]) - return merge_lists_of_dicts(result, archive_dict, "id") + fields_list = list(self._fields) + if LOG_ARCHIVE_DATE in fields_list and LOG_ARCHIVE_UID in fields_list: + archive_dict = self.read([LOG_ARCHIVE_DATE, LOG_ARCHIVE_UID]) + return merge_lists_of_dicts(result, archive_dict, "id") + return result diff --git a/web_archive_date/tests/test_web_archive_date.py b/web_archive_date/tests/test_web_archive_date.py index aa061d098b..2f342daf12 100644 --- a/web_archive_date/tests/test_web_archive_date.py +++ b/web_archive_date/tests/test_web_archive_date.py @@ -12,6 +12,12 @@ def setUpClass(cls): super().setUpClass() cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + # Models + cls.company_model = cls.env["res.company"] + + # Instances + cls.company = cls.company_model.create({"name": "Test Company"}) + def test_01_check_metadata_shown(self): """ Check that the method getting the metadata on a record, once it is archived. @@ -38,3 +44,22 @@ def test_01_check_metadata_shown(self): self.partner.archive_uid.id, "User ID shown used in the metadata should be the same as the archive_uid value.", ) + + def test_02_check_metadata_shown_on_model_not_having_active_field(self): + """ + Check that the method getting the metadata on a record, if the record doesn't + have the active field. + """ + c_fields_list = list(self.company._fields) + self.assertFalse("active" in c_fields_list) + metadata = self.company.get_metadata() + self.assertEqual(len(metadata), 1, "List should only contain one value.") + value = metadata[0] + self.assertFalse( + "archive_date" in value.keys(), + "The Archive Date should not be listed for a model not having the active field.", + ) + self.assertFalse( + "archive_uid" in value.keys(), + "The Archive by should not be listed for a model not having the active field.", + ) From 9c5cf80b9376759e11f4f260d2854e92377efbeb Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Thu, 6 Jul 2023 08:59:47 +0530 Subject: [PATCH 6/7] [IMP] web_archive_date: black, isort, prettier --- setup/web_archive_date/odoo/addons/web_archive_date | 1 + setup/web_archive_date/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/web_archive_date/odoo/addons/web_archive_date create mode 100644 setup/web_archive_date/setup.py diff --git a/setup/web_archive_date/odoo/addons/web_archive_date b/setup/web_archive_date/odoo/addons/web_archive_date new file mode 120000 index 0000000000..b6c6db4808 --- /dev/null +++ b/setup/web_archive_date/odoo/addons/web_archive_date @@ -0,0 +1 @@ +../../../../web_archive_date \ No newline at end of file diff --git a/setup/web_archive_date/setup.py b/setup/web_archive_date/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/web_archive_date/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 74e0464d95c9a3aa55c04ee7f45fc4cfa4d5877e Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Thu, 6 Jul 2023 09:08:27 +0530 Subject: [PATCH 7/7] [MIG] web_archive_date: Migration to 15.0 --- web_archive_date/README.rst | 4 - web_archive_date/__manifest__.py | 9 ++- .../static/src/js/debug_manager.esm.js | 77 +++++++++++++++++++ web_archive_date/static/src/xml/debug.xml | 14 ++-- 4 files changed, 91 insertions(+), 13 deletions(-) create mode 100644 web_archive_date/static/src/js/debug_manager.esm.js diff --git a/web_archive_date/README.rst b/web_archive_date/README.rst index 22270e441b..5df6072134 100644 --- a/web_archive_date/README.rst +++ b/web_archive_date/README.rst @@ -47,10 +47,6 @@ be able to see the `Latest Archived Date` `Latest Archived by` there. Known issues / Roadmap ====================== -Format of `archive_date` is not the same as `write_date` shown in the metadata. Values are formatted in javascript. Can't inherit the method and adapt the value there. - -TO BE DONE: Check how to format the value in the QWeb view somehow. - Bug Tracker =========== diff --git a/web_archive_date/__manifest__.py b/web_archive_date/__manifest__.py index 91a54414c2..570babad46 100644 --- a/web_archive_date/__manifest__.py +++ b/web_archive_date/__manifest__.py @@ -5,14 +5,19 @@ "summary": """ Reflects the Latest Archived Date and Latest Archived by on the record metadata. """, - "version": "13.0.1.0.0", + "version": "15.0.1.0.0", "category": "Usability", "license": "AGPL-3", "website": "https://github.com/OCA/server-ux", "author": "ForgeFlow, Odoo Community Association (OCA)", "depends": ["web", "base_archive_date"], "maintainers": ["GuillemCForgeFlow"], - "qweb": ["static/src/xml/debug.xml"], + "assets": { + "web.assets_backend": [ + "web_archive_date/static/src/js/debug_manager.esm.js", + ], + "web.assets_qweb": ["web_archive_date/static/src/xml/debug.xml"], + }, "installable": True, "application": False, "auto_install": True, diff --git a/web_archive_date/static/src/js/debug_manager.esm.js b/web_archive_date/static/src/js/debug_manager.esm.js new file mode 100644 index 0000000000..f64e8e131b --- /dev/null +++ b/web_archive_date/static/src/js/debug_manager.esm.js @@ -0,0 +1,77 @@ +/** @odoo-module **/ + +import {_lt} from "@web/core/l10n/translation"; +import {Dialog} from "@web/core/dialog/dialog"; +import {formatDateTime, parseDateTime} from "@web/core/l10n/dates"; +import {formatMany2one} from "@web/fields/formatters"; +import {registry} from "@web/core/registry"; + +const {hooks} = owl; +const {useState} = hooks; + +const debugRegistry = registry.category("debug"); + +class GetMetadataDialog extends Dialog { + setup() { + super.setup(); + this.state = useState({}); + } + + async willStart() { + await this.getMetadata(); + } + + async toggleNoupdate() { + await this.env.services.orm.call("ir.model.data", "toggle_noupdate", [ + this.props.res_model, + this.state.id, + ]); + await this.getMetadata(); + } + + async getMetadata() { + const metadata = ( + await this.env.services.orm.call(this.props.res_model, "get_metadata", [ + this.props.selectedIds, + ]) + )[0]; + this.state.id = metadata.id; + this.state.xmlid = metadata.xmlid; + this.state.creator = formatMany2one(metadata.create_uid); + this.state.lastModifiedBy = formatMany2one(metadata.write_uid); + this.state.noupdate = metadata.noupdate; + this.state.create_date = formatDateTime(parseDateTime(metadata.create_date), { + timezone: true, + }); + this.state.write_date = formatDateTime(parseDateTime(metadata.write_date), { + timezone: true, + }); + this.state.archive_uid = formatMany2one(metadata.archive_uid); + this.state.archive_date = formatDateTime(parseDateTime(metadata.archive_date), { + timezone: true, + }); + } +} +GetMetadataDialog.bodyTemplate = "web.DebugMenu.getMetadataBody"; +GetMetadataDialog.title = _lt("View Metadata"); + +function viewMetadata({action, component, env}) { + const selectedIds = component.widget.getSelectedIds(); + if (selectedIds.length !== 1) { + return null; + } + return { + type: "item", + description: env._t("View Metadata"), + callback: () => { + env.services.dialog.add(GetMetadataDialog, { + res_model: action.res_model, + selectedIds, + }); + }, + sequence: 320, + }; +} + +debugRegistry.category("form").remove("viewMetadata"); +debugRegistry.category("form").add("viewMetadata", viewMetadata); diff --git a/web_archive_date/static/src/xml/debug.xml b/web_archive_date/static/src/xml/debug.xml index 271aba1128..0cd8111771 100644 --- a/web_archive_date/static/src/xml/debug.xml +++ b/web_archive_date/static/src/xml/debug.xml @@ -2,16 +2,16 @@