Reduce auto admin model field names, add password_hash field to detect when the password has been really changed

apps/common/migrations/0004_auto__del_field_autoadminsingleton_auto_admin_password__del_field_auto.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'AutoAdminSingleton.auto_admin_password'
+        db.delete_column('common_autoadminsingleton', 'auto_admin_password')
+
+        # Deleting field 'AutoAdminSingleton.auto_admin_account'
+        db.delete_column('common_autoadminsingleton', 'auto_admin_account_id')
+
+        # Adding field 'AutoAdminSingleton.account'
+        db.add_column('common_autoadminsingleton', 'account',
+                      self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='auto_admin_account', null=True, to=orm['auth.User']),
+                      keep_default=False)
+
+        # Adding field 'AutoAdminSingleton.password'
+        db.add_column('common_autoadminsingleton', 'password',
+                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'AutoAdminSingleton.password_hash'
+        db.add_column('common_autoadminsingleton', 'password_hash',
+                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'AutoAdminSingleton.auto_admin_password'
+        db.add_column('common_autoadminsingleton', 'auto_admin_password',
+                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'AutoAdminSingleton.auto_admin_account'
+        db.add_column('common_autoadminsingleton', 'auto_admin_account',
+                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='auto_admin_account', null=True, to=orm['auth.User'], blank=True),
+                      keep_default=False)
+
+        # Deleting field 'AutoAdminSingleton.account'
+        db.delete_column('common_autoadminsingleton', 'account_id')
+
+        # Deleting field 'AutoAdminSingleton.password'
+        db.delete_column('common_autoadminsingleton', 'password')
+
+        # Deleting field 'AutoAdminSingleton.password_hash'
+        db.delete_column('common_autoadminsingleton', 'password_hash')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'common.anonymoususersingleton': {
+            'Meta': {'object_name': 'AnonymousUserSingleton'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lock_id': ('django.db.models.fields.CharField', [], {'default': '1', 'unique': 'True', 'max_length': '1'})
+        },
+        'common.autoadminsingleton': {
+            'Meta': {'object_name': 'AutoAdminSingleton'},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'auto_admin_account'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lock_id': ('django.db.models.fields.CharField', [], {'default': '1', 'unique': 'True', 'max_length': '1'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'password_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['common']

apps/common/models.py

@@ -50,8 +50,9 @@ class AnonymousUserSingleton(Singleton):
 
 
 class AutoAdminSingleton(Singleton):
-    auto_admin_account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'auto admin'))
-    auto_admin_password = models.CharField(null=True, blank=True, verbose_name=_(u'auto admin password'), max_length=128)
+    account = models.ForeignKey(User, null=True, blank=True, related_name='auto_admin_account', verbose_name=_(u'account'))
+    password = models.CharField(null=True, blank=True, verbose_name=_(u'password'), max_length=128)
+    password_hash = models.CharField(null=True, blank=True, verbose_name=_(u'password hash'), max_length=128)
 
     class Meta:
         verbose_name = verbose_name_plural = _(u'auto admin properties')