diff --git a/apps/common/migrations/0005_auto__del_autoadminsingleton.py b/apps/common/migrations/0005_auto__del_autoadminsingleton.py new file mode 100644 index 0000000000..715254135b --- /dev/null +++ b/apps/common/migrations/0005_auto__del_autoadminsingleton.py @@ -0,0 +1,35 @@ +# -*- 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 model 'AutoAdminSingleton' + db.delete_table('common_autoadminsingleton') + + + def backwards(self, orm): + # Adding model 'AutoAdminSingleton' + db.create_table('common_autoadminsingleton', ( + ('lock_id', self.gf('django.db.models.fields.CharField')(default=1, max_length=1, unique=True)), + ('account', self.gf('django.db.models.fields.related.ForeignKey')(related_name='auto_admin_account', null=True, to=orm['auth.User'], blank=True)), + ('password', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)), + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('password_hash', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)), + )) + db.send_create_signal('common', ['AutoAdminSingleton']) + + + models = { + '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'}) + } + } + + complete_apps = ['common'] \ No newline at end of file diff --git a/apps/user_management/migrations/0001_initial.py b/apps/user_management/migrations/0001_initial.py new file mode 100644 index 0000000000..b3a2c4b728 --- /dev/null +++ b/apps/user_management/migrations/0001_initial.py @@ -0,0 +1,74 @@ +# -*- 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): + # Adding model 'AutoAdminSingleton' + db.create_table('user_management_autoadminsingleton', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('lock_id', self.gf('django.db.models.fields.CharField')(default=1, unique=True, max_length=1)), + ('account', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='auto_admin_account', null=True, to=orm['auth.User'])), + ('password', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)), + ('password_hash', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)), + )) + db.send_create_signal('user_management', ['AutoAdminSingleton']) + + + def backwards(self, orm): + # Deleting model 'AutoAdminSingleton' + db.delete_table('user_management_autoadminsingleton') + + + 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'}) + }, + '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'}) + }, + 'user_management.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'}) + } + } + + complete_apps = ['user_management'] \ No newline at end of file diff --git a/apps/user_management/migrations/__init__.py b/apps/user_management/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/user_management/models.py b/apps/user_management/models.py index 71a8362390..cb2c4f925d 100644 --- a/apps/user_management/models.py +++ b/apps/user_management/models.py @@ -1,3 +1,16 @@ -from django.db import models +from __future__ import absolute_import -# Create your models here. +from django.db import models +from django.utils.translation import ugettext_lazy as _ +from django.contrib.auth.models import User + +from common.models import Singleton + + +class AutoAdminSingleton(Singleton): + 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') diff --git a/apps/user_management/templatetags/__init__.py b/apps/user_management/templatetags/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/user_management/templatetags/autoadmin_tags.py b/apps/user_management/templatetags/autoadmin_tags.py index 27c3ffd1c7..4a6737ee08 100644 --- a/apps/user_management/templatetags/autoadmin_tags.py +++ b/apps/user_management/templatetags/autoadmin_tags.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.template import Library -from common.models import AutoAdminSingleton +from ..models import AutoAdminSingleton register = Library()