Merge branch 'master' into admin-cleanup

rloomans · Dec 17, 2016 · 1846946 · 1846946
2 parents faf819c + 1a5d37f
commit 1846946
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/teamtemp/responses/admin.py b/teamtemp/responses/admin.py
@@ -20,7 +20,7 @@ class UserAdmin(admin.ModelAdmin):
 class TeamTemperatureAdmin(admin.ModelAdmin):
     list_display = ("id", "creator", "survey_type", "creation_date")
     list_filter = ("survey_type", )
-    readonly_fields = ("id", "creation_date", "modified_date")
+    readonly_fields = ("id", "creation_date", "modified_date", "creator")
 
 
 class TemperatureResponseAdmin(admin.ModelAdmin):

diff --git a/teamtemp/responses/models.py b/teamtemp/responses/models.py
@@ -47,9 +47,9 @@ class TeamTemperature(models.Model):
     archive_schedule = models.IntegerField(default=0)
     archive_date = models.DateTimeField(null=True)
     survey_type = models.CharField(default=TEAM_TEMP, choices=SURVEY_TYPE_CHOICES, max_length=20, db_index=True)
-    dept_names = models.CharField(default='DEPT,DEPT2', max_length=64)
-    region_names = models.CharField(default='REGION,REGION2', max_length=64)
-    site_names = models.CharField(default='SITE,SITE2', max_length=64)
+    dept_names = models.CharField(default='DEPT,DEPT2', blank=True, max_length=64)
+    region_names = models.CharField(default='REGION,REGION2', blank=True, max_length=64)
+    site_names = models.CharField(default='SITE,SITE2', blank=True, max_length=64)
     default_tz = models.CharField(default='Australia/Queensland', max_length=64)
     max_word_count = models.IntegerField(default=1)
     creation_date = models.DateTimeField(auto_now_add=True)

diff --git a/teamtemp/responses/serializers.py b/teamtemp/responses/serializers.py
@@ -6,7 +6,7 @@
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
-        fields = ('url', 'id', 'team_temperatures', 'temperature_responses')
+        fields = ('url', 'id', 'creation_date', 'team_temperatures', 'temperature_responses')
 
 
 class WordCloudImageSerializer(serializers.HyperlinkedModelSerializer):
@@ -21,8 +21,8 @@ class Meta:
         fields = ('url', 'id', 'creation_date', 'creator', 'archive_schedule',
                   'archive_date', 'survey_type', 'default_tz',
                   'max_word_count', 'dept_names', 'site_names',
-                  'region_names', 'teams', 'team_response_histories',
-                  'temperature_responses')
+                  'region_names', 'creation_date', 'modified_date','teams',
+                  'team_response_histories', 'temperature_responses')
 
 
 class TemperatureResponseSerializer(serializers.HyperlinkedModelSerializer):
@@ -36,7 +36,7 @@ class TeamSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Teams
         fields = ('url', 'id', 'request', 'team_name', 'dept_name', 'site_name',
-                  'region_name')
+                  'region_name', 'creation_date', 'modified_date')
 
 
 class TeamResponseHistorySerializer(serializers.HyperlinkedModelSerializer):