Merge branch 'archweb-generic' into master-nomake

Conflicts:
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 9 insertions, 1 deletions

diff --git a/mirrors/admin.py b/mirrors/admin.py
index 17365486..d5c89c2a 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from urlparse import urlparse, urlunsplit
 
 from django import forms
@@ -67,12 +68,19 @@ class MirrorAdmin(admin.ModelAdmin):
             'isos', 'admin_email', 'alternate_email')
     list_filter = ('tier', 'active', 'public')
     search_fields = ('name', 'admin_email', 'alternate_email')
-    readonly_fields = ('created',)
+    readonly_fields = ('created', 'last_modified')
     inlines = [
             MirrorUrlInlineAdmin,
             MirrorRsyncInlineAdmin,
     ]
 
+    def save_model(self, request, obj, form, change):
+        if '~~~' in obj.notes:
+            date = datetime.utcnow().strftime('%Y-%m-%d')
+            usertext = request.user.get_full_name()
+            obj.notes = obj.notes.replace('~~~', '%s (%s)' % (date, usertext))
+        obj.save()
+
 
 class MirrorProtocolAdmin(admin.ModelAdmin):
     list_display = ('protocol', 'is_download', 'default')