product_variant_change_attribute_value: cleanup

product_variant_change_attribute_value/tests/test_product_variant_change_attribute_value.py

@@ -79,7 +79,7 @@ def test_remove_attribute_value(self):
 
         wiz = self.wizard.with_context(default_res_ids=self.variants).create({})
         self._change_action(wiz, self.steel, "delete")
-        wiz.action_change_attributes()
+        wiz.action_apply()
 
         self.assertFalse(self.is_value_on_variant(self.variant_1, self.steel))
         self.assertFalse(
@@ -92,7 +92,7 @@ def test_change_attribure_value(self):
 
         wiz = self.wizard.with_context(default_res_ids=self.variants).create({})
         self._change_action(wiz, self.white, "replace", self.pink)
-        wiz.action_change_attributes()
+        wiz.action_apply()
 
         self.assertFalse(self.is_value_on_variant(self.variant_1, self.white))
         self.assertTrue(self.is_value_on_variant(self.variant_1, self.pink))
@@ -115,7 +115,7 @@ def test_change_attribute_value_2(self):
             default_res_ids=[self.variant_3.id, self.variant_4.id]
         ).create({})
         self._change_action(wiz, self.white, "replace", self.pink)
-        wiz.action_change_attributes()
+        wiz.action_apply()
 
         self.assertFalse(self.is_value_on_variant(self.variant_3, self.white))
         self.assertFalse(self.is_value_on_variant(self.variant_4, self.white))
@@ -142,12 +142,12 @@ def test_active_deactivate_attribute_value_2_step(self):
         )
         wiz = self.wizard.with_context(default_res_ids=self.variants).create({})
         self._change_action(wiz, self.white, "replace", self.pink)
-        wiz.action_change_attributes()
+        wiz.action_apply()
         self.assertFalse(
             self._is_attribute_value_on_template(self.variant_1, self.white)
         )
         self._change_action(wiz, self.black, "replace", self.white)
-        wiz.action_change_attributes()
+        wiz.action_apply()
         self.assertTrue(
             self._is_attribute_value_on_template(self.variant_1, self.white)
         )
@@ -165,7 +165,7 @@ def test_active_deactivate_attribute_value_1_step(self):
         wiz = self.wizard.with_context(default_res_ids=self.variants).create({})
         self._change_action(wiz, self.white, "replace", self.pink)
         self._change_action(wiz, self.black, "replace", self.white)
-        wiz.action_change_attributes()
+        wiz.action_apply()
         self.assertTrue(
             self._is_attribute_value_on_template(self.variant_1, self.white)
         )

product_variant_change_attribute_value/wizards/product_variant_attribute_value_action.py

@@ -8,31 +8,32 @@ class ProductVariantAttributeValueAction(models.TransientModel):
     _name = "variant.attribute.value.action"
     _description = "Wizard action to do on variant attribute value"
 
-    def _get_attribute_action_list(self):
-        return [
-            ("delete", "Delete"),
-            ("replace", "Replace"),
-            ("do_nothing", "Do Nothing"),
-        ]
-
-    product_attribute_value_id = fields.Many2one("product.attribute.value",)
+    product_attribute_value_id = fields.Many2one(comodel_name="product.attribute.value")
     attribute_action = fields.Selection(
-        selection="_get_attribute_action_list", default="do_nothing", required=True,
+        selection="_selection_action", default="do_nothing", required=True,
     )
     attribute_id = fields.Many2one(
-        "product.attribute",
+        comodel_name="product.attribute",
         related="product_attribute_value_id.attribute_id",
         readonly=True,
     )
     selectable_attribute_value_ids = fields.Many2many(
-        "product.attribute.value", compute="_compute_selectable_attribute_value_ids"
+        comodel_name="product.attribute.value",
+        compute="_compute_selectable_attribute_value_ids",
     )
     replaced_by_id = fields.Many2one(
-        "product.attribute.value",
+        comodel_name="product.attribute.value",
         string="Replace with",
         domain="[('id', 'in', selectable_attribute_value_ids)]",
     )
 
+    def _selection_action(self):
+        return [
+            ("do_nothing", "Do Nothing"),
+            ("replace", "Replace"),
+            ("delete", "Delete"),
+        ]
+
     @api.depends("attribute_action")
     def _compute_selectable_attribute_value_ids(self):
         for rec in self:

product_variant_change_attribute_value/wizards/product_variant_attribute_value_wizard.py

@@ -14,7 +14,7 @@ class VariantAttributeValueWizard(models.TransientModel):
     product_variant_count = fields.Integer(compute="_compute_count")
     product_template_count = fields.Integer(compute="_compute_count")
     attributes_action_ids = fields.Many2many(
-        "variant.attribute.value.action",
+        comodel_name="variant.attribute.value.action",
         relation="variant_attribute_wizard_attribute_action_rel",
         default=lambda self: self._default_attributes_action_ids(),
     )
@@ -47,9 +47,9 @@ def _compute_count(self):
                 record.product_ids.mapped("product_tmpl_id")
             )
 
-    def action_change_attributes(self):
+    def action_apply(self):
         for product in self.product_ids:
-            self.update_variant_value(product)
+            self._action_apply(product)
 
     def _is_attribute_value_being_used(self, variant_id, attribute_value):
         """Check if attribute value is still used by a variant."""
@@ -64,12 +64,12 @@ def _is_attribute_value_being_used(self, variant_id, attribute_value):
         )
         return attribute_value in existing_attributes
 
-    def update_variant_value(self, product_id):
+    def _action_apply(self, product):
         """Update a variant with all the actions set by the user in the wizard."""
         TplAttrLine = self.env["product.template.attribute.line"]
         TplAttrValue = self.env["product.template.attribute.value"]
-        template = product_id.product_tmpl_id
-        pav_ids = product_id.product_template_attribute_value_ids.mapped(
+        template = product.product_tmpl_id
+        pav_ids = product.product_template_attribute_value_ids.mapped(
             "product_attribute_value_id"
         )
         for value_action in self.attributes_action_ids:
@@ -120,14 +120,14 @@ def update_variant_value(self, product_id):
                         }
                     )
             # Update the values set on the product variant
-            ptav_ids = product_id.product_template_attribute_value_ids.filtered(
+            ptav_ids = product.product_template_attribute_value_ids.filtered(
                 lambda r: r.product_attribute_value_id != pav
             )
             if action == "replace":
                 ptav_ids |= tpl_attr_value
-            product_id.product_template_attribute_value_ids = ptav_ids
+            product.product_template_attribute_value_ids = ptav_ids
             # Remove the changed value from the template attribute line if needed
-            if not self._is_attribute_value_being_used(product_id, pav):
+            if not self._is_attribute_value_being_used(product, pav):
                 tpl_attr_line = template.attribute_line_ids.filtered(
                     lambda l: l.attribute_id == pav.attribute_id
                 )

product_variant_change_attribute_value/wizards/product_variant_attribute_value_wizard.xml

@@ -60,8 +60,8 @@
                     </notebook>
                     <footer>
                         <button
-                            name="action_change_attributes"
-                            string="Save"
+                            name="action_apply"
+                            string="Apply"
                             type="object"
                             class="btn-primary"
                         />