Corrected CustomField ordering

puck · Aug 23, 2016 · 25c4689 · 25c4689
1 parent 4a2e80a
commit 25c4689
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/netbox/extras/migrations/0002_custom_fields.py b/netbox/extras/migrations/0002_custom_fields.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-08-23 16:10
+# Generated by Django 1.10 on 2016-08-23 16:24
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
                 ('obj_type', models.ManyToManyField(help_text=b'The object(s) to which this field applies.', related_name='custom_fields', to='contenttypes.ContentType', verbose_name=b'Object(s)')),
             ],
             options={
-                'ordering': ['name'],
+                'ordering': ['weight', 'name'],
             },
         ),
         migrations.CreateModel(

diff --git a/netbox/extras/models.py b/netbox/extras/models.py
@@ -97,7 +97,7 @@ class CustomField(models.Model):
                                                                      "form")
 
     class Meta:
-        ordering = ['name']
+        ordering = ['weight', 'name']
 
     def __unicode__(self):
         return self.label or self.name.replace('_', ' ').capitalize()