Просмотр исходного кода

add migration for django 1.9 changes in usermodel, fix testssuite

Rafał Pitoń 9 лет назад
Родитель
Сommit
4591494170

+ 2 - 2
misago/readtracker/tests/test_readtracker.py

@@ -200,14 +200,14 @@ class ThreadsTrackerTests(ReadTrackerTests):
 
     def test_thread_replied_unread_for_user(self):
         """replied thread is unread for user"""
-        self.reply_thread(self.thread)
+        self.reply_thread()
 
         threadstracker.make_read_aware(self.user, self.thread)
         self.assertFalse(self.thread.is_read)
 
     def _test_thread_read(self):
         """thread read flag is set for user, then its set as unread by reply"""
-        self.reply_thread(self.thread)
+        self.reply_thread()
 
         add_acl(self.user, self.categories)
         threadstracker.make_read_aware(self.user, self.thread)

+ 2 - 2
misago/threads/threadtypes/thread.py

@@ -24,8 +24,8 @@ class Thread(ThreadType):
 
     def get_category_last_thread_url(self, category):
         return reverse('misago:thread', kwargs={
-            'slug': thread.slug,
-            'pk': thread.pk
+            'slug': category.last_thread.slug,
+            'pk': category.last_thread.pk
         })
 
     def get_category_last_post_url(self, category):

+ 1 - 1
misago/users/migrations/0001_initial.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
+                ('last_login', models.DateTimeField(null=True, blank=True, verbose_name='last login')),
                 ('username', models.CharField(max_length=30)),
                 ('slug', models.CharField(unique=True, max_length=30)),
                 ('email', models.EmailField(max_length=255, db_index=True)),

+ 32 - 0
misago/users/migrations/0005_dj_19_update.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-17 02:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import misago.users.models.user
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('misago_users', '0004_default_ranks'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+                ('objects', misago.users.models.user.UserManager()),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='rank',
+            name='roles',
+            field=models.ManyToManyField(blank=True, to='misago_acl.Role'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='groups',
+            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+        ),
+    ]

+ 2 - 5
misago/users/models/user.py

@@ -198,12 +198,9 @@ class User(AbstractBaseUser, PermissionsMixin):
     last_ip = models.GenericIPAddressField(null=True, blank=True)
     is_hiding_presence = models.BooleanField(default=False)
 
-    rank = models.ForeignKey(
-        'Rank', null=True, blank=True, on_delete=models.PROTECT)
+    rank = models.ForeignKey('Rank', null=True, blank=True, on_delete=models.deletion.PROTECT)
     title = models.CharField(max_length=255, null=True, blank=True)
-    requires_activation = models.PositiveIntegerField(
-        default=ACTIVATION_REQUIRED_NONE
-    )
+    requires_activation = models.PositiveIntegerField(default=ACTIVATION_REQUIRED_NONE)
     is_staff = models.BooleanField(_('staff status'),
         default=False,
         help_text=_('Designates whether the user can log into admin sites.'),