добавленны лайки

access/migrations/0009_auto_20171016_1634.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-16 16:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('access', '0008_auto_20171016_1159'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='gender',
+            field=models.SmallIntegerField(choices=[(0, 'undefined'), (2, 'female'), (1, 'male')], default=0),
+        ),
+        migrations.AlterField(
+            model_name='invite',
+            name='hash',
+            field=models.CharField(default='vwiZvxTTDrJJUUF', max_length=15),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_login',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='last login'),
+        ),
+    ]

access/models.py

@@ -83,8 +83,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     email = models.EmailField(_('email address'), unique=True)
     first_name = models.CharField(_('first name'), max_length=30, blank=True, default='Guest')
     last_name = models.CharField(_('last name'), max_length=30, blank=True)
-    date_joined = models.DateTimeField(_('date joined'), verbose_name='дата создания профиля', auto_now_add=True)
+    date_joined = models.DateTimeField(_('date joined'), auto_now_add=True)
-    last_login = models.DateTimeField(_('last_login'), verbose_name='дата последней авторизации', auto_now_add=True)
+    last_login = models.DateTimeField(_('last login'), auto_now_add=True)
     is_staff = models.BooleanField(verbose_name='флаг персонала', default=False,
                                    help_text='Определяет разрешение пользователя на вход в административную часть.')
     is_active = models.BooleanField(verbose_name='активен', default=False,

courses/models.py

@@ -122,7 +122,7 @@ class SkillJ(models.Model):
 
 class Achievements(models.Model):
     course = models.ForeignKey(to="Course")
-    icon = models.ImageField(verbose_name='Отображение достижения', upload_to='diplomas')
+    icon = models.ImageField(verbose_name='Отображение достижения', upload_to='diplomas', blank=True, null=True)
     user = models.ForeignKey(to=settings.AUTH_USER_MODEL)
 
     def __str__(self):

journals/default_ations.py

@@ -24,16 +24,6 @@ if __name__ == '__main__':
         text='отказ от чего-либо',
     )
 
-    Action.objects.update_or_create(
-        name='like',
-        text='нравится что-либо',
-    )
-
-    Action.objects.update_or_create(
-        name='dislike',
-        text='не нравится что-либо',
-    )
-
     Action.objects.update_or_create(
         name='favorite',
         text='добавить в избранное',

management/models.py

@@ -8,7 +8,7 @@ from storage.models import Storage
 
 class Comment(models.Model):
     closed = models.BooleanField(verbose_name='Закрыт', default=False, editable=False)
-    user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name=u'Автор', related_name='comment_owner')
+    user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name=u'Автор')
     text = models.TextField(verbose_name='Текст', default='')
     files = models.ManyToManyField(Storage, verbose_name='Прикрепленые файлы', blank=True, editable=False)
     children = models.ManyToManyField(to='self', blank=True, symmetrical=False)
@@ -22,3 +22,18 @@ class Comment(models.Model):
     class Meta:
         verbose_name = 'Комментарий'
         verbose_name_plural = 'Комментарии'
+
+
+class Like(models.Model):
+    user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name=u'Автор')
+    is_positive = models.BooleanField(default=True)
+    content_type = models.ForeignKey(to=ContentType)
+    object_id = models.PositiveIntegerField()
+    content_object = GenericForeignKey('content_type', 'object_id')
+
+    def __str__(self):
+        return str(self.id) + ': ' + 'Лайк' if self.is_positive else 'Дизлайк'
+
+    class Meta:
+        verbose_name = 'Лайк-дизлайк'
+        verbose_name_plural = 'Лайки-дизлайки'