Merge pull request #3849 from allegro/fix-other-m2m-polymorphic-save

Fix other m2m polymorphic save

src/ralph/deployment/migrations/0009_auto_20240924_1133.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2024-09-24 11:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+import ralph.lib.polymorphic.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployment', '0008_auto_20240705_1210'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='preboot',
+            name='items',
+            field=ralph.lib.polymorphic.fields.PolymorphicManyToManyField(blank=True, to='deployment.PrebootItem', verbose_name='files'),
+        ),
+    ]

src/ralph/deployment/models.py

@@ -14,6 +14,7 @@
 from ralph.lib.external_services.models import JobQuerySet
 from ralph.lib.mixins.fields import NUMP
 from ralph.lib.mixins.models import AdminAbsoluteUrlMixin, NamedMixin
+from ralph.lib.polymorphic.fields import PolymorphicManyToManyField
 from ralph.lib.polymorphic.models import Polymorphic, PolymorphicBase
 from ralph.lib.transitions.models import TransitionJob
 
@@ -149,7 +150,7 @@ class Preboot(AdminAbsoluteUrlMixin, NamedMixin):
     objects = Manager()
     active_objects = ActiveObjectsManager()
 
-    items = models.ManyToManyField(
+    items = PolymorphicManyToManyField(
         PrebootItem,
         blank=True,
         verbose_name=_('files'),

src/ralph/lib/polymorphic/fields.py

@@ -0,0 +1,6 @@
+from django.db.models import ManyToManyField
+
+
+class PolymorphicManyToManyField(ManyToManyField):
+    def save_form_data(self, instance, data):
+        getattr(instance, self.attname).set(data[:])

src/ralph/lib/polymorphic/models.py

@@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def values_list(self, *fields, **kwargs):
-        flat = kwargs.pop('flat', False)
+        flat = kwargs.get('flat', False)
         if flat:
             return [getattr(obj, fields[0]) for obj in self[:]]
         else:

src/ralph/lib/polymorphic/tests/migrations/0004_auto_20240924_1142.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2024-09-24 11:42
+from __future__ import unicode_literals
+
+from django.db import migrations
+import ralph.lib.polymorphic.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('polymorphic_tests', '0003_auto_20240506_1133'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='somem2mmodel',
+            name='polymorphics',
+            field=ralph.lib.polymorphic.fields.PolymorphicManyToManyField(related_name='some_m2m', to='polymorphic_tests.PolymorphicModelBaseTest'),
+        ),
+    ]

src/ralph/lib/polymorphic/tests/models.py

@@ -2,6 +2,7 @@
 import logging
 from django.db import models
 
+from ralph.lib.polymorphic.fields import PolymorphicManyToManyField
 from ralph.lib.polymorphic.models import Polymorphic, PolymorphicBase
 
 
@@ -35,6 +36,6 @@ def __str__(self):
 
 class SomeM2MModel(models.Model):
     name = models.CharField(max_length=50)
-    polymorphics = models.ManyToManyField(
+    polymorphics = PolymorphicManyToManyField(
         PolymorphicModelBaseTest, related_name="some_m2m"
     )

src/ralph/networks/admin.py

@@ -155,10 +155,6 @@ class NetworkAdmin(RalphMPTTAdmin):
         })
     )
 
-    def save_model(self, request, obj, form, change):
-        form.cleaned_data['terminators'] = form.cleaned_data['terminators'][:]
-        super(NetworkAdmin, self).save_model(request, obj, form, change)
-
     def get_changelist(self, request, **kwargs):
         return NetworkRalphChangeList
 

src/ralph/networks/migrations/0016_auto_20240924_1155.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2024-09-24 11:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+import ralph.lib.polymorphic.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('networks', '0015_auto_20211115_1125'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='network',
+            name='terminators',
+            field=ralph.lib.polymorphic.fields.PolymorphicManyToManyField(blank=True, to='assets.BaseObject', verbose_name='network terminators'),
+        ),
+    ]

src/ralph/networks/models/networks.py

@@ -27,6 +27,7 @@
     PreviousStateMixin,
     TimeStampMixin
 )
+from ralph.lib.polymorphic.fields import PolymorphicManyToManyField
 from ralph.networks.fields import IPNetwork
 from ralph.networks.models.choices import IPAddressStatus
 
@@ -268,7 +269,7 @@ class Network(
         default='',
     )
     # TODO: create ManyToManyBaseObjectField to avoid through table
-    terminators = models.ManyToManyField(
+    terminators = PolymorphicManyToManyField(
         'assets.BaseObject',
         verbose_name=_('network terminators'),
         blank=True