Merge branch 'master' of gitlab.com:lilcity/backend into feature/testing_courses_30-01-19

api/v1/views.py

@@ -455,6 +455,8 @@ class UserViewSet(ExtendedModelViewSet):
                 serializer = self.get_serializer(page, many=True)
                 return self.get_paginated_response(serializer.data)
 
+        # FIXME
+        queryset = queryset[:2000]
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 

apps/course/models.py

@@ -123,7 +123,7 @@ class Course(BaseModel, DeactivatedMixin):
         return str(self.id) + ' ' + self.title
 
     def save(self, *args, **kwargs):
-        if not self.slug:
+        if not self.slug and self.title:
             self.slug = slugify(unidecode(self.title[:90]))
         if self.slug:
             if self.slug.isdigit():

apps/course/views.py

@@ -11,6 +11,7 @@ from django.utils.cache import add_never_cache_headers
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
+from django.utils.translation import gettext as _
 
 from apps.payment.models import AuthorBalance
 from .models import Course, Like, Lesson, CourseComment, LessonComment