odoo-addon-dms 15.0.1.5.1.1__py3-none-any.whl → 15.0.1.6.0__py3-none-any.whl

odoo/addons/dms/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Document Management System",
     "summary": """Document Management System for Odoo""",
-    "version": "15.0.1.5.1",
+    "version": "15.0.1.6.0",
     "category": "Document Management",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/dms",

odoo/addons/dms/models/abstract_dms_mixin.py

@@ -37,7 +37,21 @@ class AbstractDmsMixin(models.AbstractModel):
     @api.model
     def search_panel_select_range(self, field_name, **kwargs):
         """Add context to display short folder name."""
-        _self = self.with_context(directory_short_name=True)
+        _self = self.with_context(
+            directory_short_name=True, skip_sanitized_parent_hierarchy=True
+        )
         return super(AbstractDmsMixin, _self).search_panel_select_range(
             field_name, **kwargs
         )
+
+    def _search_panel_sanitized_parent_hierarchy(self, records, parent_name, ids):
+        if self.env.context.get("skip_sanitized_parent_hierarchy"):
+            all_ids = [value["id"] for value in records]
+            # Prevent error if user not access to parent record
+            for value in records:
+                if value["parent_id"] and value["parent_id"][0] not in all_ids:
+                    value["parent_id"] = False
+            return records
+        return super()._search_panel_sanitized_parent_hierarchy(
+            records=records, parent_name=parent_name, ids=ids
+        )

odoo/addons/dms/models/directory.py

@@ -258,7 +258,15 @@ class DmsDirectory(models.Model):
         current_directory = self
         while current_directory:
             directories.insert(0, current_directory)
-            if access_token and consteq(current_directory.access_token, access_token):
+            if (
+                (
+                    access_token
+                    and current_directory.access_token
+                    and consteq(current_directory.access_token, access_token)
+                )
+                or not access_token
+                and current_directory.check_access_rights("read")
+            ):
                 return directories
             current_directory = current_directory.parent_id
         if access_token:
@@ -267,11 +275,15 @@ class DmsDirectory(models.Model):
         return directories
 
     def _get_own_root_directories(self):
-        return (
-            self.env["dms.directory"]
-            .search([("is_hidden", "=", False), ("parent_id", "=", False)])
-            .ids
+        res = self.env["dms.directory"].search_read(
+            [("is_hidden", "=", False)], ["parent_id"]
         )
+        all_ids = [value["id"] for value in res]
+        res_ids = []
+        for item in res:
+            if not item["parent_id"] or item["parent_id"][0] not in all_ids:
+                res_ids.append(item["id"])
+        return res_ids
 
     allowed_model_ids = fields.Many2many(
         related="storage_id.model_ids",

odoo/addons/dms/models/dms_security_mixin.py

@@ -102,7 +102,10 @@ class DmsSecurityMixin(models.AbstractModel):
                 self._directory_field,
                 inherited_access_field,
             )
-        inherited_access_domain = [(inherited_access_field, "=", True)]
+        inherited_access_domain = [
+            ("storage_id_save_type", "=", "attachment"),
+            (inherited_access_field, "=", True),
+        ]
         domains = []
         # Get all used related records
         related_groups = self.sudo().read_group(

odoo/addons/dms/views/directory.xml

@@ -562,7 +562,7 @@
                         </page>
                         <page
                             string="Groups"
-                            attrs="{'invisible':[('storage_id_inherit_access_from_parent_record', '=', True)]}"
+                            attrs="{'invisible':[('storage_id_save_type', '=', 'attachment'),('storage_id_inherit_access_from_parent_record', '=', True)]}"
                         >
                             <field name="group_ids">
                                 <tree>
@@ -575,7 +575,7 @@
                         </page>
                         <page
                             string="Complete Groups"
-                            attrs="{'invisible':[('storage_id_inherit_access_from_parent_record', '=', True)]}"
+                            attrs="{'invisible':[('storage_id_save_type', '=', 'attachment'),('storage_id_inherit_access_from_parent_record', '=', True)]}"
                         >
                             <field name="complete_group_ids">
                                 <tree>

{odoo_addon_dms-15.0.1.5.1.1.dist-info → odoo_addon_dms-15.0.1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-dms
-Version: 15.0.1.5.1.1
+Version: 15.0.1.6.0
 Summary: Document Management System for Odoo
 Home-page: https://github.com/OCA/dms
 Author: MuK IT, Tecnativa, Odoo Community Association (OCA)

{odoo_addon_dms-15.0.1.5.1.1.dist-info → odoo_addon_dms-15.0.1.6.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 odoo/addons/dms/README.rst,sha256=_NGbhYqeNMZkhpfkaClLUvJziBcuiQ_GdKC9YwNELA4,6906
 odoo/addons/dms/__init__.py,sha256=jQ-fltIs1ohXt7udDkkJwzh7ckauQW2rbmv1Wtg3SjQ,47
-odoo/addons/dms/__manifest__.py,sha256=XhCvdvLmftReyCfRuOFOVeJTCgQPGtP8sjAyKjWcKfk,2130
+odoo/addons/dms/__manifest__.py,sha256=0ODOhdog_hdrI9k_xf651VMoZac5v5xc_9uBHuUoviE,2130
 odoo/addons/dms/actions/file.xml,sha256=NlRIQoCbbDSaRmsumJP9dcrNtYpQji74hwhfi5TillE,524
 odoo/addons/dms/controllers/__init__.py,sha256=akfNDwFGryweTYowOA3DbbP0zvLmQtCdihtGhYvsIPQ,40
 odoo/addons/dms/controllers/main.py,sha256=3HvKTk8OiFPiqkKN952Ozy-9NmtpLnaYsguL-VSmicY,1902
@@ -21,13 +21,13 @@ odoo/addons/dms/i18n/it.po,sha256=ejaH7lZYmrLE_eq-mI7MdBIAGqOIYJEpgCg5jDb6FTQ,68
 odoo/addons/dms/i18n/nl.po,sha256=XHKL8-miSI44Spuq3LfP6R7V50NzEOcqsC5jPdkbOGA,67836
 odoo/addons/dms/i18n/ru.po,sha256=vsojqbV4yeGnl3lzEb5DDrVeU0OD9SnWFXReocZL0VU,67666
 odoo/addons/dms/models/__init__.py,sha256=La9Zyaj_PZKuwp73-PAlyFwgZlK8skeYxl5LovFjTm8,371
-odoo/addons/dms/models/abstract_dms_mixin.py,sha256=Gu4FfvetI2snvOYzSR6a_WMW8Jxu2iIkBw-HbE06_zU,1422
+odoo/addons/dms/models/abstract_dms_mixin.py,sha256=1cKd4uJE9MCop4GYaHLwpDyvLaLLGLewGkpPTFgDcv0,2080
 odoo/addons/dms/models/access_groups.py,sha256=nwIRYs48rG4Gc1M65aYcNtzUDljTa0KSCyUsHPxB8ig,5482
 odoo/addons/dms/models/base.py,sha256=h6hYw7C_OwbP9xih1Cw6v0lOWypEk1pocc0q2gLHaYA,599
 odoo/addons/dms/models/category.py,sha256=goe3tZbwDXtlxrwGB0_sGMJW7RkJh3MtTBe4YvYokbI,4110
-odoo/addons/dms/models/directory.py,sha256=hCimg9kXCH9YH2tOVzjQTrjHMRmaOeC3VdGWFDgsQeM,25928
+odoo/addons/dms/models/directory.py,sha256=TGRdrUNeL4_uBZsy94NPD_pslBBGRWJgcs_fIw-nDZ4,26375
 odoo/addons/dms/models/dms_file.py,sha256=hOGDPDM2c83us0csug30Iu6OkVtdrFIFwe3i6Sophcc,21385
-odoo/addons/dms/models/dms_security_mixin.py,sha256=F7RvdGd0wJSqqZ0xsztQU6oBAl78P59r3tHHXsT5xFo,9623
+odoo/addons/dms/models/dms_security_mixin.py,sha256=GwanqRbJfFYgQhQwvp17f6V1AVzXktjGm_xDRpF6h0w,9703
 odoo/addons/dms/models/ir_attachment.py,sha256=-AwkedqL2cgPZ794O31UIMvchrf_a9TPVE1rEb--CXQ,3248
 odoo/addons/dms/models/mail_thread.py,sha256=ccAn2MHONCncjsJewBrLqMVBl6tmn2kezyJVJq2utVk,583
 odoo/addons/dms/models/mixins_thumbnail.py,sha256=DCb8wrWTjdQp2ev9SfYHe9LLZuC18c5jSftm2Er9Aho,1466
@@ -180,7 +180,7 @@ odoo/addons/dms/tests/data/mail02.eml,sha256=QDbZu4Xne3-VgntqqDBviBcSB4Y8Cgn_I8O
 odoo/addons/dms/tools/__init__.py,sha256=X0El9WW-bmLhnUpcS_csCs0TR1RcxaQg36Dy8wyg_vI,19
 odoo/addons/dms/tools/file.py,sha256=NYgdhsu1qdcLfMInmzhMs-PzDKmFm3wuo9kx610mSJs,1488
 odoo/addons/dms/views/category.xml,sha256=fjes6BqnZpcB8IJhZliZP4C7HqjJHlRVqRo4mvlEt38,4434
-odoo/addons/dms/views/directory.xml,sha256=l3zI7vfLVf-qE0IpkoHuXOOhz1z4WofvNHTA-yK2vzw,34647
+odoo/addons/dms/views/directory.xml,sha256=QSfsvI3d1hOX4RfMAGDNe4LAqxQkNf67BiP6xiQRXgc,34735
 odoo/addons/dms/views/dms_access_groups_views.xml,sha256=vVeq7iGl7YfT1GKVGsulwOdPc6z3xS51hsRXfR2hR7w,5427
 odoo/addons/dms/views/dms_file.xml,sha256=VoK4dkpTI335AjyaGOGRDGidlTEorqIafwnELevsrhI,29957
 odoo/addons/dms/views/dms_portal_templates.xml,sha256=piujeenSeFNfeQzME_wphQ16Heg2AFmWtBnLO_yv3Z0,5638
@@ -188,7 +188,7 @@ odoo/addons/dms/views/menu.xml,sha256=YJxLfNpa7HqM5rj09kXGUeernJp9sSTA_mDICKvIs9
 odoo/addons/dms/views/res_config_settings.xml,sha256=TMRNYnFW1U5Az5hqxIbkqIiaRaIzN7iGZO0M0TMu-Qk,5175
 odoo/addons/dms/views/storage.xml,sha256=8WL4JZYzq1ngI6S_X7xSRuMSOykwk1br22Df0vm5W2Y,10448
 odoo/addons/dms/views/tag.xml,sha256=A1-WfRlN5TumsEdIEUwx7G2RpX7iHV37ztKxGABLvi0,7186
-odoo_addon_dms-15.0.1.5.1.1.dist-info/METADATA,sha256=Aqc0CXwzQoR-cP0lAA4MS0U6RDv-TnNuPaqBZeLH8cQ,7578
-odoo_addon_dms-15.0.1.5.1.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-odoo_addon_dms-15.0.1.5.1.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_dms-15.0.1.5.1.1.dist-info/RECORD,,
+odoo_addon_dms-15.0.1.6.0.dist-info/METADATA,sha256=8ciAjTRUw0WnSonBLEsCjgaeBiT0CDSNeMvzdYo3ixE,7576
+odoo_addon_dms-15.0.1.6.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+odoo_addon_dms-15.0.1.6.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_dms-15.0.1.6.0.dist-info/RECORD,,