Parcourir la source

Renamed 'last_modified' to 'last_updated'

Jeremy Stretch il y a 8 ans
Parent
commit
921040d2fc

+ 5 - 5
netbox/secrets/admin.py

@@ -9,8 +9,8 @@ from .models import UserKey, SecretRole, Secret
 class UserKeyAdmin(admin.ModelAdmin):
 class UserKeyAdmin(admin.ModelAdmin):
     actions = ['activate_selected']
     actions = ['activate_selected']
     list_display = ['user', 'is_filled', 'is_active', 'created']
     list_display = ['user', 'is_filled', 'is_active', 'created']
-    fields = ['user', 'public_key', 'is_active', 'last_modified']
-    readonly_fields = ['is_active', 'last_modified']
+    fields = ['user', 'public_key', 'is_active', 'last_updated']
+    readonly_fields = ['is_active', 'last_updated']
 
 
     def get_readonly_fields(self, request, obj=None):
     def get_readonly_fields(self, request, obj=None):
         # Don't allow a user to modify an existing public key directly.
         # Don't allow a user to modify an existing public key directly.
@@ -66,6 +66,6 @@ class SecretRoleAdmin(admin.ModelAdmin):
 
 
 @admin.register(Secret)
 @admin.register(Secret)
 class SecretAdmin(admin.ModelAdmin):
 class SecretAdmin(admin.ModelAdmin):
-    list_display = ['device', 'role', 'name', 'created', 'last_modified']
-    fields = ['device', 'role', 'name', 'hash', 'created', 'last_modified']
-    readonly_fields = ['device', 'hash', 'created', 'last_modified']
+    list_display = ['device', 'role', 'name', 'created', 'last_updated']
+    fields = ['device', 'role', 'name', 'hash', 'created', 'last_updated']
+    readonly_fields = ['device', 'hash', 'created', 'last_updated']

+ 1 - 1
netbox/secrets/api/serializers.py

@@ -40,7 +40,7 @@ class SecretSerializer(serializers.ModelSerializer):
 
 
     class Meta:
     class Meta:
         model = Secret
         model = Secret
-        fields = ['id', 'device', 'role', 'name', 'plaintext', 'hash', 'created', 'last_modified']
+        fields = ['id', 'device', 'role', 'name', 'plaintext', 'hash', 'created', 'last_updated']
 
 
 
 
 class SecretNestedSerializer(SecretSerializer):
 class SecretNestedSerializer(SecretSerializer):

+ 25 - 0
netbox/secrets/migrations/0006_auto_20160622_1501.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-06-22 15:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('secrets', '0005_auto_20160614_2019'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='secret',
+            old_name='last_modified',
+            new_name='last_updated',
+        ),
+        migrations.RenameField(
+            model_name='userkey',
+            old_name='last_modified',
+            new_name='last_updated',
+        ),
+    ]

+ 2 - 2
netbox/secrets/models.py

@@ -61,7 +61,7 @@ class UserKey(models.Model):
     public_key = models.TextField(verbose_name='RSA public key')
     public_key = models.TextField(verbose_name='RSA public key')
     master_key_cipher = models.BinaryField(max_length=512, blank=True, null=True, editable=False)
     master_key_cipher = models.BinaryField(max_length=512, blank=True, null=True, editable=False)
     created = models.DateTimeField(auto_now_add=True, verbose_name='Time created')
     created = models.DateTimeField(auto_now_add=True, verbose_name='Time created')
-    last_modified = models.DateTimeField(auto_now=True, verbose_name='Last modified')
+    last_updated = models.DateTimeField(auto_now=True, verbose_name='Last modified')
 
 
     objects = UserKeyQuerySet.as_manager()
     objects = UserKeyQuerySet.as_manager()
 
 
@@ -201,7 +201,7 @@ class Secret(models.Model):
     ciphertext = models.BinaryField(editable=False, max_length=65568)  # 16B IV + 2B pad length + {62-65550}B padded
     ciphertext = models.BinaryField(editable=False, max_length=65568)  # 16B IV + 2B pad length + {62-65550}B padded
     hash = models.CharField(max_length=128, editable=False)
     hash = models.CharField(max_length=128, editable=False)
     created = models.DateTimeField(auto_now_add=True, editable=False, verbose_name='Created')
     created = models.DateTimeField(auto_now_add=True, editable=False, verbose_name='Created')
-    last_modified = models.DateTimeField(auto_now=True, verbose_name='Last modified')
+    last_updated = models.DateTimeField(auto_now=True, verbose_name='Last modified')
 
 
     plaintext = None
     plaintext = None
 
 

+ 2 - 2
netbox/secrets/tables.py

@@ -38,8 +38,8 @@ class SecretTable(BaseTable):
     device = tables.LinkColumn('secrets:secret', args=[Accessor('pk')], verbose_name='Device')
     device = tables.LinkColumn('secrets:secret', args=[Accessor('pk')], verbose_name='Device')
     role = tables.Column(verbose_name='Role')
     role = tables.Column(verbose_name='Role')
     name = tables.Column(verbose_name='Name')
     name = tables.Column(verbose_name='Name')
-    last_modified = tables.DateTimeColumn(verbose_name='Last modified')
+    last_updated = tables.DateTimeColumn(verbose_name='Last updated')
 
 
     class Meta(BaseTable.Meta):
     class Meta(BaseTable.Meta):
         model = Secret
         model = Secret
-        fields = ('pk', 'device', 'role', 'name', 'last_modified')
+        fields = ('pk', 'device', 'role', 'name', 'last_updated')