From 3feb668ad3a1be1d4bf28e5d51cef692d2eafb49 Mon Sep 17 00:00:00 2001
From: Alexander Pace <alexander.pace@ligo.org>
Date: Thu, 5 Nov 2020 10:09:55 -0600
Subject: [PATCH] updated nicknaming
---
gracedb/api/v1/superevents/serializers.py | 2 +-
gracedb/events/migrations/0056_nickname.py | 5 +----
gracedb/events/models.py | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/gracedb/api/v1/superevents/serializers.py b/gracedb/api/v1/superevents/serializers.py
index 9eb916580..cd20dcff6 100644
--- a/gracedb/api/v1/superevents/serializers.py
+++ b/gracedb/api/v1/superevents/serializers.py
@@ -407,7 +407,7 @@ class SupereventNicknameSerializer(serializers.ModelSerializer):
class Meta:
model = Nickname
- fields = ('self', 'name', 'created', 'creator')
+ fields = ('self', 'name', 'created', 'creator', 'comment')
def get_self(self, obj):
return api_reverse('superevents:superevent-nickname-detail', args=[
diff --git a/gracedb/events/migrations/0056_nickname.py b/gracedb/events/migrations/0056_nickname.py
index dbe0c78db..2567dab71 100644
--- a/gracedb/events/migrations/0056_nickname.py
+++ b/gracedb/events/migrations/0056_nickname.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.10 on 2020-10-29 18:37
+# Generated by Django 2.2.10 on 2020-11-02 23:14
from django.conf import settings
from django.db import migrations, models
@@ -25,8 +25,5 @@ class Migration(migrations.Migration):
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
('creator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
- options={
- 'unique_together': {('object_id', 'content_type')},
- },
),
]
diff --git a/gracedb/events/models.py b/gracedb/events/models.py
index f36ef952c..cef46e2b9 100644
--- a/gracedb/events/models.py
+++ b/gracedb/events/models.py
@@ -179,8 +179,8 @@ class Nickname(models.Model):
def natural_key(self):
return self.name
- class Meta():
- unique_together = [('object_id', 'content_type')]
+ #class Meta():
+ #unique_together = [('object_id', 'content_type')]
def __str__(self):
return self.name
--
GitLab