Исправление ошибки с дублированием блока

remotes/origin/hasaccess
Vitaly Baev 8 years ago
parent 59ca1b41f1
commit 7ff7bc0013
  1. 12
      web/src/components/CourseRedactor.vue
  2. 8
      web/src/js/modules/api.js

@ -334,7 +334,8 @@
], ],
showErrors: false, showErrors: false,
savingTimeout: null, savingTimeout: null,
categoryOptions: [] categoryOptions: [],
courseSyncHook: false, // Если true, то watch не будет отправлять курс на обновление
} }
}, },
validations: { validations: {
@ -528,7 +529,11 @@
this.savingTimeout = setTimeout(() => { this.savingTimeout = setTimeout(() => {
document.getElementById('course-redactor__saving-status').innerText = ''; document.getElementById('course-redactor__saving-status').innerText = '';
}, 2000); }, 2000);
// this.course = api.convertCourseJson(response.data); this.courseSyncHook = true;
this.course = api.convertCourseJson(response.data);
this.$nextTick(() => {
this.courseSyncHook = false;
})
}) })
.catch((err) => { .catch((err) => {
this.courseSaving = false; this.courseSaving = false;
@ -630,6 +635,9 @@
watch: { watch: {
'course': { 'course': {
handler: function (newValue, oldValue) { handler: function (newValue, oldValue) {
if (this.courseSyncHook) {
return;
}
this.saveCourseDraft(newValue, oldValue); this.saveCourseDraft(newValue, oldValue);
}, },
deep: true, deep: true,

@ -55,9 +55,11 @@ export const api = {
let deferredStart = null; let deferredStart = null;
if (courseObject.is_deferred) { if (courseObject.is_deferred) {
let deferredStartTime = moment(courseObject.time.value, "HH:mm"); if (courseObject.date && courseObject.time && courseObject.time.value) {
let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour()); let deferredStartTime = moment(courseObject.time.value, "HH:mm");
deferredStart = deferredStartDate.format(); let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour());
deferredStart = deferredStartDate.format();
}
} }
const courseJson = { const courseJson = {

Loading…
Cancel
Save