Skip to content
Snippets Groups Projects
Commit 3fe1346e authored by Tanner Prestegard's avatar Tanner Prestegard Committed by GraceDB
Browse files

Renaming superevent date_created field to created

parent 13420dd8
No related branches found
No related tags found
1 merge request!8Superevents
......@@ -33,7 +33,6 @@ class SupereventSearchFilter(filters.SearchFilter):
class SupereventOrderingFilter(filters.OrderingFilter):
ordering_param = 'sort'
field_map = {
'created': u'date_created',
'preferred_event': u'preferred_event__id',
'id': [u't_0_date', u'is_gw', u'gw_date_number', 'base_date_number'],
'superevent_id': [u't_0_date', u'is_gw', u'gw_date_number',
......
......@@ -29,8 +29,8 @@ class SupereventSerializer(serializers.ModelSerializer):
submitter = serializers.SlugRelatedField(slug_field='username',
read_only=True)
preferred_event = EventGraceidField(required=True)
created = serializers.DateTimeField(source='date_created',
format=settings.GRACE_STRFTIME_FORMAT, read_only=True)
created = serializers.DateTimeField(format=settings.GRACE_STRFTIME_FORMAT,
read_only=True)
# Add custom fields
gw_events = serializers.SerializerMethodField(read_only=True)
em_events = serializers.SerializerMethodField(read_only=True)
......
......@@ -51,7 +51,7 @@ class SupereventViewSet(viewsets.ModelViewSet):
lookup_field = SUPEREVENT_LOOKUP_FIELD
lookup_value_regex = SUPEREVENT_LOOKUP_REGEX
filter_backends = (SupereventSearchFilter, SupereventOrderingFilter,)
ordering_fields = ('date_created', 't_0', 't_start', 't_end',
ordering_fields = ('created', 't_0', 't_start', 't_end',
'preferred_event__id', 't_0_date', 'is_gw', 'base_date_number',
'gw_date_number')
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2018-06-09 03:15
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('superevents', '0007_add_gw_permission_to_superevent'),
]
operations = [
migrations.RenameField(
model_name='superevent',
old_name='date_created',
new_name='created',
),
]
......@@ -49,7 +49,7 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel):
# Fields ------------------------------------------------------------------
submitter = models.ForeignKey(UserModel)
date_created = models.DateTimeField(auto_now_add=True)
created = models.DateTimeField(auto_now_add=True)
# One-to-one relationship with preferred event - an event can only be
# preferred for a single superevent and a superevent can only have
......
......@@ -62,7 +62,7 @@ def flexigridResponse(request, objects):
t_start_times = timeSelections(object.t_start)
t_0_times = timeSelections(object.t_0)
t_end_times = timeSelections(object.t_end)
created_times = timeSelections(object.date_created)
created_times = timeSelections(object.created)
cell_values = [
'<a href="{0}">{1}</a>'.format(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment