From d2f3c02945d9ac47a9ef3efe3e396f898998e97e Mon Sep 17 00:00:00 2001
From: Peter Braun <pbraun@redhat.com>
Date: Tue, 17 Sep 2024 18:29:36 +0200
Subject: [PATCH] fix: maintain order of insertions into m2m relationship
 tables (#15536) (#6703)

---
 awx/main/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/fields.py b/awx/main/fields.py
index 49895d70fc..7a74aadb3c 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -1039,7 +1039,7 @@ class OrderedManyToManyField(models.ManyToManyField):
             descriptor = getattr(instance, self.name)
             order_with_respect_to = descriptor.source_field_name
 
-            for i, ig in enumerate(sender.objects.filter(**{order_with_respect_to: instance.pk})):
+            for i, ig in enumerate(sender.objects.filter(**{order_with_respect_to: instance.pk}).order_by('id')):
                 if ig.position != i:
                     ig.position = i
                     ig.save()