Merge branch 'dev' into 'master'

teacher's hashtag, autosave no validation See merge request lilcity/backend!40
8 years ago · 5e1b56e1d9
parent 040c35fabb 92f4461621
commit 5e1b56e1d9
1 changed files with 7 additions and 5 deletions
--- a/web/src/components/CourseRedactor.vue
+++ b/web/src/components/CourseRedactor.vue
@ -699,19 +699,21 @@
            },
            validate(silent) {
                console.log('validate', this.$v.$invalid);
-                this.showErrors = true;
-                if (this.$v.course.$invalid) {
-                    if(!silent) {
+
+                if(!silent) {
+                    this.showErrors = true;
+                    if (this.$v.course.$invalid) {
                        for(let i in this.$v.course) {
                            if(this.$v.course[i].$invalid) {
                                showNotification("error", "Ошибка валидации поля "+this.fields[i]);
                            }
                        }
+                        // showNotification("error", "Заполните все необходимые поля");
+                        return false;
                    }
-                    // showNotification("error", "Заполните все необходимые поля");
-                    return false;
                }

+
                return true;
            },
            validateLesson(silent) {