Merge PR #412 into 18.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

dms/models/dms_file.py

@@ -197,6 +197,7 @@ def check_access_token(self, access_token=False):
         string="Attachment File",
         prefetch=False,
         ondelete="cascade",
+        index=True,
     )
 
     def get_human_size(self):
@@ -601,6 +602,13 @@ def create(self, vals_list):
             new_vals_list.append(vals)
         return super().create(new_vals_list)
 
+    def unlink(self):
+        attachments = self.mapped("attachment_id")
+        res = super().unlink()
+        if not self.env.context.get("dms_file"):
+            attachments.with_context(dms_file=True).unlink()
+        return res
+
     # ----------------------------------------------------------
     # Locking fields and functions
     locked_by = fields.Many2one(comodel_name="res.users")

dms/models/ir_attachment.py

@@ -1,4 +1,4 @@
-# Copyright 2021 Tecnativa - Víctor Martínez
+# Copyright 2021-2025 Tecnativa - Víctor Martínez
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 from odoo import api, models
 from odoo.tools import ormcache
@@ -99,3 +99,10 @@ def write(self, vals):
         ):
             self._dms_operations()
         return res
+
+    def unlink(self):
+        if not self.env.context.get("dms_file"):
+            self.env["dms.file"].search(
+                [("attachment_id", "in", self.ids)]
+            ).with_context(dms_file=True).unlink()
+        return super().unlink()

dms/tests/test_storage_attachment.py

@@ -48,6 +48,22 @@ def test_storage_attachment_record_db_unlink(self):
         directories = self.env["dms.directory"].search([])
         self.assertNotIn(directory.id, directories.ids)
 
+    @mute_logger("odoo.models.unlink")
+    def test_storage_attachment_unlink_lock_file(self):
+        group_partner_manager = self.env.ref("base.group_partner_manager")
+        self.dms_manager_user.write({"groups_id": [(4, group_partner_manager.id)]})
+        self.dms_user.write({"groups_id": [(4, group_partner_manager.id)]})
+        attachment = self._create_attachment("demo.txt")
+        attachment = attachment.with_user(self.dms_manager_user)
+        file = self.storage.storage_file_ids.filtered(lambda x: x.name == "demo.txt")
+        file.with_user(self.dms_user).lock()
+        self.assertTrue(file.is_locked)
+        self.assertFalse(file.is_lock_editor)
+        file.with_user(self.dms_user).unlock()
+        self.assertFalse(file.is_locked)
+        attachment.unlink()
+        self.assertFalse(file.exists())
+
     @users("dms-manager")
     def test_storage_attachment_misc(self):
         attachment = self._create_attachment("demo.txt")
@@ -105,6 +121,8 @@ def test_storage_attachment_misc(self):
         self.assertEqual(
             self.storage.count_storage_files, 2, "Storage should have 2 files"
         )
+        dms_file.unlink()
+        self.assertFalse(attachment.exists())
 
     @users("dms-manager")
     def test_storage_attachment_directory_record_ref_access_dms_manager(self):

dms/views/dms_file.xml

@@ -141,7 +141,7 @@
                                     </div>
                                     <div
                                         role="menuitem"
-                                        t-if="record.permission_write.raw_value and record.active.raw_value"
+                                        t-if="record.permission_write.raw_value and record.active.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                     >
                                         <a name="toggle_active" type="object">
                                             <i class="fa fa-archive" />
@@ -150,7 +150,7 @@
                                     </div>
                                     <div
                                         role="menuitem"
-                                        t-if="record.permission_write.raw_value and !record.active.raw_value"
+                                        t-if="record.permission_write.raw_value and !record.active.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                     >
                                         <a name="toggle_active" type="object">
                                             <i class="fa fa-archive" />
@@ -190,7 +190,7 @@
                                     </div>
                                     <div
                                         role="menuitem"
-                                        t-if="record.permission_unlink.raw_value"
+                                        t-if="record.permission_unlink.raw_value and (!record.is_locked.raw_value or (record.is_locked.raw_value and record.is_lock_editor.raw_value))"
                                     >
                                         <a type="delete">
                                             <i class="fa fa-trash-o" />