From 8ead4985dec347df7184f5d1b6aabf7b22cac962 Mon Sep 17 00:00:00 2001 From: Roman Prykhodchenko Date: Thu, 28 May 2020 12:43:33 +0200 Subject: [PATCH 1/2] Order service environments alphabetically Close: #3540 --- src/ralph/assets/models/assets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ralph/assets/models/assets.py b/src/ralph/assets/models/assets.py index a5e7837943..35e799fbfc 100644 --- a/src/ralph/assets/models/assets.py +++ b/src/ralph/assets/models/assets.py @@ -116,6 +116,7 @@ def __str__(self): class Meta: unique_together = ('service', 'environment') + ordering = ('service__name', 'environment__name') @property def service_name(self): From d0b2db06f4b124f861ffe5b7bbc98868eea47272 Mon Sep 17 00:00:00 2001 From: Roman Prykhodchenko Date: Thu, 28 May 2020 13:02:15 +0200 Subject: [PATCH 2/2] Ass missing migrations --- .../migrations/0030_auto_20200528_1301.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/ralph/assets/migrations/0030_auto_20200528_1301.py diff --git a/src/ralph/assets/migrations/0030_auto_20200528_1301.py b/src/ralph/assets/migrations/0030_auto_20200528_1301.py new file mode 100644 index 0000000000..1c74c46516 --- /dev/null +++ b/src/ralph/assets/migrations/0030_auto_20200528_1301.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0029_asset_start_usage'), + ] + + operations = [ + migrations.AlterModelOptions( + name='serviceenvironment', + options={'ordering': ('service__name', 'environment__name')}, + ), + ]