From 91ee536322b791c52e6dcea4c1e4e58c5530cd48 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 3 Mar 2018 14:44:58 +0000
Subject: [PATCH] Renamed some datetime fields from 'time' to 'modified', to
 match their semantics, and changed them to use auto_now=True.  This should
 fix an issue with outdated timestamps on some meeting-related objects.  -
 Legacy-Id: 14724

---
 .../migrations/0003_rename_modified_fields.py | 35 +++++++++++++++++++
 ietf/meeting/models.py                        |  4 +--
 ietf/meeting/views.py                         |  4 +--
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 ietf/meeting/migrations/0003_rename_modified_fields.py

diff --git a/ietf/meeting/migrations/0003_rename_modified_fields.py b/ietf/meeting/migrations/0003_rename_modified_fields.py
new file mode 100644
index 000000000..98d3f66e3
--- /dev/null
+++ b/ietf/meeting/migrations/0003_rename_modified_fields.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-03-02 14:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0002_auto_20180225_1207'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='floorplan',
+            old_name='time',
+            new_name='modified',
+        ),
+        migrations.RenameField(
+            model_name='room',
+            old_name='time',
+            new_name='modified',
+        ),
+        migrations.AlterField(
+            model_name='floorplan',
+            name='modified',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='modified',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 42b53c51d..014a500d6 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -302,7 +302,7 @@ class ResourceAssociation(models.Model):
 
 class Room(models.Model):
     meeting = ForeignKey(Meeting)
-    time = models.DateTimeField(default=datetime.datetime.now)
+    modified = models.DateTimeField(auto_now=True)
     name = models.CharField(max_length=255)
     functional_name = models.CharField(max_length=255, blank = True)
     capacity = models.IntegerField(null=True, blank=True)
@@ -392,7 +392,7 @@ def floorplan_path(instance, filename):
 class FloorPlan(models.Model):
     name    = models.CharField(max_length=255)
     short   = models.CharField(max_length=3, default='')
-    time    = models.DateTimeField(default=datetime.datetime.now)
+    modified= models.DateTimeField(auto_now=True)
     meeting = ForeignKey(Meeting)
     order   = models.SmallIntegerField()
     image   = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=floorplan_path, blank=True, default=None)
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 075fe598f..a946334c5 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -964,10 +964,10 @@ def json_agenda(request, num=None ):
         if room.x1 is not None:
             roomdict['x'] = (room.x1+room.x2)/2.0
             roomdict['y'] = (room.y1+room.y2)/2.0
-        roomdict['modified'] = room.time
+        roomdict['modified'] = room.modified
         if room.floorplan and room.floorplan.image:
             roomdict['map'] = room.floorplan.image.url
-            roomdict['modified'] = max(room.time,room.floorplan.time)
+            roomdict['modified'] = max(room.modified, room.floorplan.modified)
         rooms.append(roomdict)
 
     parents = []