mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LIL-645

Browse Source
remotes/origin/hotfix/LIL-691
gzbender 7 years ago
parent 898d5bf3df
commit 0c4af2d876
2 changed files with 15 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      project/urls.py
  2. 27
      web/src/components/CourseRedactor.vue

5
project/urls.py
Unescape View File

@ -47,9 +47,8 @@ urlpatterns = [
path('author-request/success/', TemplateView.as_view(template_name='user/become-author-success.html'), name='author-request-success'), path('author-request/success/', TemplateView.as_view(template_name='user/become-author-success.html'), name='author-request-success'),
path('courses/', CoursesView.as_view(), name='courses'), path('courses/', CoursesView.as_view(), name='courses'),
path('course/create', CourseEditView.as_view(), name='course_create'), path('course/create', CourseEditView.as_view(), name='course_create'),
path('course/create/lessons', CourseEditView.as_view(), name='course_create_lessons'), path('course/<int:pk>/lessons/new', CourseEditView.as_view(), name='course_lessons_new'),
path('course/create/lessons/new', CourseEditView.as_view(), name='course_create_lessons_new'), path('course/<int:pk>/lessons/<int:lesson>/edit', CourseEditView.as_view(), name='course_lessons_edit'),
path('course/create/lessons/edit/<int:lesson>', CourseEditView.as_view(), name='course_create_lessons_edit'),
path('course/on-moderation', CourseOnModerationView.as_view(), name='course-on-moderation'), path('course/on-moderation', CourseOnModerationView.as_view(), name='course-on-moderation'),
path('course/<int:pk>/', CourseView.as_view(), name='course'), path('course/<int:pk>/', CourseView.as_view(), name='course'),
path('course/<str:slug>/', CourseView.as_view(), name='course'), path('course/<str:slug>/', CourseView.as_view(), name='course'),

27
web/src/components/CourseRedactor.vue
Unescape View File

@ -198,7 +198,7 @@
</div> </div>
<div class="lessons__subtitle subtitle">{{ lesson.title }}</div> <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
<div class="lessons__row"> <div class="lessons__row">
<div class="lessons__content">{{ lesson.short_description | linebreaks }}</div> <div class="lessons__content">{{ lesson.short_description }}</div>
</div> </div>
</div> </div>
</vue-draggable> </vue-draggable>
@ -463,18 +463,18 @@
}, },
editLesson(lessonIndex) { editLesson(lessonIndex) {
this.currentLesson = this.lessons[lessonIndex]; this.currentLesson = this.lessons[lessonIndex];
history.push("/course/create/lessons/edit/"+this.currentLesson.id); history.push(`/course/${this.course.id}/lessons/${this.currentLesson.id}/edit`);
this.viewSection = 'lessons-edit'; this.viewSection = 'lessons-edit';
}, },
showCourse() { showCourse() {
if (this.viewSection !== 'course') { if (this.viewSection !== 'course') {
history.push("/course/create"); history.push(this.course.id ? `/course/${this.course.id}/edit` : "/course/create");
} }
this.viewSection = 'course' this.viewSection = 'course'
}, },
showLessons() { showLessons() {
if (this.viewSection !== 'lessons') { if (this.viewSection !== 'lessons') {
history.push("/course/create/lessons"); history.push(`/course/${this.course.id}/edit/lessons`);
} }
this.viewSection = 'lessons'; this.viewSection = 'lessons';
}, },
@ -485,7 +485,7 @@
content: [], content: [],
}; };
if (this.viewSection !== 'lessons-edit') { if (this.viewSection !== 'lessons-edit') {
history.push("/course/create/lessons/new"); history.push(`/course/${this.course.id}/lessons/new`);
} }
this.viewSection = 'lessons-edit'; this.viewSection = 'lessons-edit';
window.scrollTo(0, 0); window.scrollTo(0, 0);
@ -558,7 +558,7 @@
return req; return req;
}, },
goToLessons() { goToLessons() {
history.push("/course/create/lessons"); history.push(`/course/${this.course.id}/edit/lessons`);
this.viewSection = 'lessons'; this.viewSection = 'lessons';
this.$nextTick(() => { this.$nextTick(() => {
const elementTop = $('#course-redactor__nav').position().top - 130; const elementTop = $('#course-redactor__nav').position().top - 130;
@ -813,18 +813,17 @@
}, },
updateViewSection(location, action) { updateViewSection(location, action) {
//console.log('updateViewSection[action]', action); //console.log('updateViewSection[action]', action);
if (location.pathname === '/course/create/lessons') { if (location.pathname.match(/course\/\d+\/edit\/lessons/)) {
this.viewSection = 'lessons'; this.viewSection = 'lessons';
} else if (location.pathname === '/course/create') { } else if (location.pathname.match(/course\/\d+\/lessons\/new/)){
this.viewSection = 'course';
} else if (location.pathname === '/course/create/lessons/new') {
this.viewSection = 'lessons-edit'; this.viewSection = 'lessons-edit';
} else if (location.pathname.indexOf('/course/create/lessons/edit') !== -1) { } else if (location.pathname.match(/course\/\d+\/lessons\/\d+\/edit/)) {
let lessonId = parseInt(location.pathname.split('/').pop()); // let lessonId = parseInt(location.pathname.split('/').pop());
//console.log('lessonId', lessonId, this.lessons.toString()); const lessonId = +location.pathname.match(/lessons\/(\d+)\/edit/)[1];
//console.log('lessod edit', this.lessons.find((i)=>{return i.id === lessonId}));
this.currentLesson = this.lessons.find((i)=>{return i.id === lessonId}); this.currentLesson = this.lessons.find((i)=>{return i.id === lessonId});
this.viewSection = 'lessons-edit'; this.viewSection = 'lessons-edit';
} else {
this.viewSection = 'course';
} }
}, },
onLessonsChanged() { onLessonsChanged() {

Write Preview
Loading…
Cancel
Save