From 326d3c9e374d797ded154eaa7a37ba7c69adb888 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 7 May 2018 10:39:48 +0300 Subject: [PATCH 01/15] role check, users email --- web/src/components/CourseRedactor.vue | 2 +- web/src/components/consts.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 25feea79..eeecdea3 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -877,7 +877,7 @@ if (usersResponse.data) { this.users = usersResponse.data.results.map((user) => { return { - title: `${user.first_name} ${user.last_name} (${user.email})`, + title: `${user.first_name} ${user.last_name}`, value: user.id } }); diff --git a/web/src/components/consts.js b/web/src/components/consts.js index c078d72e..139ad04b 100644 --- a/web/src/components/consts.js +++ b/web/src/components/consts.js @@ -1,3 +1,4 @@ export const ROLE_USER = 0; export const ROLE_AUTHOR = 1; -export const ROLE_ADMIN = 2; \ No newline at end of file +export const ROLE_TEACHER = 2; +export const ROLE_ADMIN = 3; \ No newline at end of file From 846cee41817a2f1fc51658ee3c0f29895a03f8ff Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 7 May 2018 10:43:37 +0300 Subject: [PATCH 02/15] Fix live lessons serializers --- api/v1/serializers/school.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/v1/serializers/school.py b/api/v1/serializers/school.py index 8c4322cc..e6edc578 100644 --- a/api/v1/serializers/school.py +++ b/api/v1/serializers/school.py @@ -133,6 +133,7 @@ class LiveLessonCreateSerializer(DispatchContentMixin, serializers.ModelSerializ 'short_description', 'stream', 'date', + 'cover', 'content', 'live', 'created_at', @@ -178,6 +179,7 @@ class LiveLessonSerializer(serializers.ModelSerializer): 'short_description', 'stream', 'date', + 'cover', 'content', 'live', 'created_at', From f202aea5485b91043d4dc0052cee10b8adaa7a9e Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 7 May 2018 10:44:16 +0300 Subject: [PATCH 03/15] User menu in own template --- project/templates/blocks/header.html | 46 +---------------------- project/templates/blocks/user_menu.html | 43 +++++++++++++++++++++ project/templates/lilcity/edit_index.html | 46 +---------------------- 3 files changed, 45 insertions(+), 90 deletions(-) create mode 100644 project/templates/blocks/user_menu.html diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html index 2eacd9ff..66606457 100644 --- a/project/templates/blocks/header.html +++ b/project/templates/blocks/header.html @@ -43,51 +43,7 @@ - {% if request.user.is_authenticated %} - - {% else %} - - {% endif %} + {% include 'templates/blocks/user_menu.html' %} {% if request.user.is_authenticated %} {% if not request.user.is_email_proved and not request.user.fb_id %} diff --git a/project/templates/blocks/user_menu.html b/project/templates/blocks/user_menu.html new file mode 100644 index 00000000..5679af79 --- /dev/null +++ b/project/templates/blocks/user_menu.html @@ -0,0 +1,43 @@ +{% load static %} {% load thumbnail %} +{% if request.user.is_authenticated %} + +{% else %} + +{% endif %} diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html index 38dc3b65..23bb204a 100644 --- a/project/templates/lilcity/edit_index.html +++ b/project/templates/lilcity/edit_index.html @@ -55,51 +55,7 @@ - {% if request.user.is_authenticated %} - - {% else %} - - {% endif %} + {% include 'templates/blocks/user_menu.html' %} {% if request.user.is_authenticated %} From e572bbfa8015671bed5178530946d1ab9297aa7e Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 7 May 2018 11:14:13 +0300 Subject: [PATCH 04/15] Don't use tz --- project/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/settings.py b/project/settings.py index bc021332..e72c3c78 100644 --- a/project/settings.py +++ b/project/settings.py @@ -149,7 +149,7 @@ USE_I18N = True USE_L10N = True -USE_TZ = True +# USE_TZ = True # Static files (CSS, JavaScript, Images) From 202c47b81a130c178bce640469ec446bb09f0128 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 7 May 2018 11:20:14 +0300 Subject: [PATCH 05/15] Fix active link in header --- project/templates/blocks/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html index 66606457..71cfefe7 100644 --- a/project/templates/blocks/header.html +++ b/project/templates/blocks/header.html @@ -26,7 +26,7 @@