Rebased users migrations

misago/users/migrations/0002_db_settings.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from south.utils import datetime_utils as datetime
 from south.db import db
-from south.v2 import DataMigration
+from south.v2 import SchemaMigration
 from django.db import models
 from misago.conf.migrationutils import migrate_settings_group, with_conf_models
 from misago.core.migrationutils import ugettext_lazy as _
@@ -151,7 +151,7 @@ class Migration(SchemaMigration):
     def backwards(self, orm):
         pass
 
-    models = {
+    models = with_conf_models('0001_initial', {
         u'auth.group': {
             'Meta': {'object_name': 'Group'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -201,7 +201,9 @@ class Migration(SchemaMigration):
             'username': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
             'username_slug': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         }
-    }
+    })
+
+    no_dry_run = True
 
     complete_apps = ['users']
 

misago/users/migrations/0003_default_ranks.py

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+from misago.core.migrationutils import ugettext_lazy as _
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        Rank = orm['users.Rank']
+
+        Rank.objects.create(
+                            name=_("Forum Team").message,
+                            slug='forum-team',
+                            title=_("Team").message,
+                            style='team',
+                            order=0,
+                            is_tab=True,
+                            is_on_index=True,
+                            )
+
+        Rank.objects.create(
+                            name=_("Most Valuable Posters").message,
+                            slug='most-valuable-posters',
+                            title=_("MVP").message,
+                            style='mvp',
+                            order=1,
+                            is_tab=True,
+                            )
+
+
+        Rank.objects.create(
+                            name=_("Members").message,
+                            slug='members',
+                            is_default=True,
+                            order=2,
+                            )
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'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'}),
+            u'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'})
+        },
+        'users.rank': {
+            'Meta': {'object_name': 'Rank'},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_on_index': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_tab': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'style': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'users.user': {
+            'Meta': {'object_name': 'User'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'db_index': 'True'}),
+            'email_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'joined_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'rank': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['users.Rank']", 'on_delete': 'models.PROTECT'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'username_slug': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        }
+    }
+
+    no_dry_run = True
+
+    complete_apps = ['users']

misago/users/models/__init__.py

@@ -1,3 +1,3 @@
 # flake8: noqa
-from misago.users.models.usermodel import User
 from misago.users.models.rankmodel import Rank
+from misago.users.models.usermodel import User

misago/users/models/rankmodel.py

@@ -5,6 +5,11 @@ from misago.admin import site
 from misago.core.utils import slugify
 
 
+class RankManager(models.Manager):
+    def default(self):
+        return self.get(is_default=True)
+
+
 class Rank(models.Model):
     name = models.CharField(max_length=255)
     slug = models.CharField(max_length=255)
@@ -17,6 +22,8 @@ class Rank(models.Model):
     order = models.IntegerField(default=0)
     #roles = models.ManyToManyField('Role')
 
+    objects = RankManager()
+
     class Meta:
         app_label = 'users'
         get_latest_by = 'order'
@@ -58,4 +65,5 @@ site.add_node(
     namespace='misago:admin:users:ranks',
     link='misago:admin:users:ranks:index',
     name=_("Ranks"),
+    after='misago:admin:users:accounts:index',
     icon='fa fa-graduation-cap')

misago/users/models/usermodel.py

@@ -5,6 +5,7 @@ from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from misago.admin import site
 from misago.core.utils import slugify
+from misago.users.models import Rank
 from misago.users.utils import hash_email
 from misago.users.validators import (validate_email, validate_password,
                                      validate_username)
@@ -28,6 +29,10 @@ class UserManager(BaseUserManager):
         user.set_username(username)
         user.set_email(email)
         user.set_password(password)
+
+        if not 'rank' in extra_fields:
+            user.rank = Rank.objects.default()
+
         user.save(using=self._db)
         return user