Changeset aa6a940

Timestamp:

Aug 13, 2011, 9:53:10 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

0bd161f

Parents:

9bf5237

git-author:

Alex Dehnert <adehnert@…> (08/13/11 21:53:10)

git-committer:

Alex Dehnert <adehnert@…> (08/13/11 21:53:10)

Message:

Fix updater information

Systems updating entries should call set_updater with the updater (as a string
or request.user object) in order to ensure that the updater is correct.
Otherwise, it will be unset on instance.save(). Regardless, the update_time
will be updated.

This mechanism is independent of django-reversion's history functionality,
which also stores the updater.

Note, in particular, that the admin does not currently use this interface
to store the updater, but does store it in django-reversion's system (along
with the rest of the history). Porting the "view group" page over may be
desirable.

Location:

asadb

Files:

• groups/models.py (modified) (2 diffs)
• groups/views.py (modified) (3 diffs)
• settings.py (modified) (1 diff)
• template/groups/group_detail.html (modified) (1 diff)

asadb/groups/models.py

@@ -3 +3 @@
 
 import datetime
+
+import settings
 
 # Create your models here.
@@ -27 +29 @@
     athena_locker = models.CharField(max_length=20, blank=True)
     recognition_date = models.DateField()
-    update_date = models.DateTimeField()
-    updater = models.CharField(max_length=30) # match Django username field
+    update_date = models.DateTimeField(editable=False, )
+    updater = models.CharField(max_length=30, editable=False, ) # match Django username field
+    _updater_set = False
+
+    def update_string(self, ):
+        updater = self.updater or "unknown"
+        return "%s by %s" % (self.update_date.strftime(settings.DATETIME_FORMAT_PYTHON), updater, )
+
+    def set_updater(self, who):
+        if hasattr(who, 'username'):
+            self.updater = who.username
+        else:
+            self.updater = who
+        self._updater_set = True
+
+    def save(self, ):
+        if not self._updater_set:
+            self.updater = None
+        self.update_date = datetime.datetime.now()
+        super(Group, self).save()
 
     def officers(self, role=None, person=None, as_of="now",):

asadb/groups/views.py

@@ -78 +78 @@
     ]
     nobody_fields = [
-        'recognition_date', 'updater', 'update_date',
+        'recognition_date',
     ]
 
@@ -105 +105 @@
             ('more-info', {
                 'legend': 'Additional Information',
-                'fields': ['constitution_url', 'advisor_name', 'athena_locker', 'updater', 'update_date', ],
+                'fields': ['constitution_url', 'advisor_name', 'athena_locker', ],
             }),
         ]
@@ -131 +131 @@
 
         if form.is_valid(): # All validation rules pass
-            request_obj = form.save()
+            request_obj = form.save(commit=False)
+            request_obj.set_updater(request.user)
+            request_obj.save()
+            form.save_m2m()
 
             # Send email

asadb/settings.py

@@ -39 +39 @@
 # to load the internationalization machinery.
 USE_I18N = True
+
+DATETIME_FORMAT_PYTHON = "%c"
 
 from local_settings import *

asadb/template/groups/group_detail.html

@@ -47 +47 @@
 </tr>
 <tr><th>Athena locker</th><td>{{group.athena_locker}}</td></tr>
-<tr><th>Last updated</th><td>{{group.update_date}} by {{group.updater}}</td></tr>
+<tr><th>Last updated</th><td>{{group.update_string}}</td></tr>
 
 {% if viewpriv %}