From d17efce4f52b5c27691c02306334d15bf924cdee Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 27 Apr 2017 11:27:34 -0400 Subject: [PATCH] Fixes #1111: Correct database ordering of SessionKey model --- netbox/secrets/migrations/0002_userkey_add_session_key.py | 4 ++-- netbox/secrets/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/secrets/migrations/0002_userkey_add_session_key.py b/netbox/secrets/migrations/0002_userkey_add_session_key.py index 04daf4d77..4cd885cfb 100644 --- a/netbox/secrets/migrations/0002_userkey_add_session_key.py +++ b/netbox/secrets/migrations/0002_userkey_add_session_key.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.6 on 2017-03-14 17:19 +# Generated by Django 1.11 on 2017-04-27 15:26 from __future__ import unicode_literals from django.conf import settings @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ], options={ - 'ordering': ['user__username'], + 'ordering': ['userkey__user__username'], }, ), migrations.AlterField( diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py index 2692a5113..e39f1832b 100644 --- a/netbox/secrets/models.py +++ b/netbox/secrets/models.py @@ -195,7 +195,7 @@ class SessionKey(models.Model): key = None class Meta: - ordering = ['user__username'] + ordering = ['userkey__user__username'] def __str__(self): return self.userkey.user.username