From 146792eabfa1486dc8bef0be6f2b0c86f2d2d663 Mon Sep 17 00:00:00 2001 From: Mikheil Barnaveli Date: Wed, 29 May 2024 12:00:04 +0400 Subject: [PATCH] [IMP] document_page_portal: black, isort, prettier --- document_page_portal/controllers/portal.py | 4 +- document_page_portal/models/document_page.py | 1 - .../document_page_portal_security.xml | 152 +++++++++++++++--- .../tests/test_document_page_portal.py | 1 - document_page_portal/views/document_page.xml | 3 - 5 files changed, 134 insertions(+), 27 deletions(-) diff --git a/document_page_portal/controllers/portal.py b/document_page_portal/controllers/portal.py index 07da1248..f874a34a 100644 --- a/document_page_portal/controllers/portal.py +++ b/document_page_portal/controllers/portal.py @@ -110,7 +110,7 @@ class CustomerPortal(CustomerPortal): "date": date_begin, "document_pages": document_pages, "page_name": "document_page", - "default_url": "/my/knowledge/s", + "default_url": "/my/knowledge/documents", "pager": pager, "archive_groups": archive_groups, "searchbar_sortings": searchbar_sortings, @@ -127,7 +127,7 @@ class CustomerPortal(CustomerPortal): @http.route( [ "/knowledge/document/", - "/knowledge/document//", + "/knowledge/document//", "/my/knowledge/document/", ], type="http", diff --git a/document_page_portal/models/document_page.py b/document_page_portal/models/document_page.py index 72bf4082..f779fc00 100644 --- a/document_page_portal/models/document_page.py +++ b/document_page_portal/models/document_page.py @@ -5,7 +5,6 @@ from odoo import fields, models class DocumentPage(models.Model): - _inherit = "document.page" is_public = fields.Boolean( diff --git a/document_page_portal/security/document_page_portal_security.xml b/document_page_portal/security/document_page_portal_security.xml index 4ab86ef4..927c4f4b 100644 --- a/document_page_portal/security/document_page_portal_security.xml +++ b/document_page_portal/security/document_page_portal_security.xml @@ -1,23 +1,135 @@ - - Documents: knowledge user: see all - - [(1, '=', 1)] - - - - Documents: portal users: portal or following - - - [ - '|', '|', ('type', '!=', 'content'), ('is_public', '=', True), - ('message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id]) - ] - - - + + + + + + + diff --git a/document_page_portal/tests/test_document_page_portal.py b/document_page_portal/tests/test_document_page_portal.py index ab7f38b3..2ffc7791 100644 --- a/document_page_portal/tests/test_document_page_portal.py +++ b/document_page_portal/tests/test_document_page_portal.py @@ -15,7 +15,6 @@ class TestPortalDocumentPage(odoo.tests.HttpCase): "is_public": True, } ) - self.start_tour("/", "document_page_portal_tour", login="portal") def test_02_document_page_portal_tour(self): diff --git a/document_page_portal/views/document_page.xml b/document_page_portal/views/document_page.xml index 5ec1c49e..898231ac 100644 --- a/document_page_portal/views/document_page.xml +++ b/document_page_portal/views/document_page.xml @@ -2,7 +2,6 @@ - document.page.form (in document_page_portal) document.page @@ -13,6 +12,4 @@ - -