From bb3ccef40784d37e6e6f1415865625c6e3f166a6 Mon Sep 17 00:00:00 2001 From: Ron Lucke Date: Wed, 29 Nov 2023 14:11:16 +0000 Subject: TIC #3112 Closes #3112 Merge request studip/studip!2353 --- .../CoursewareStructuralElement.vue | 72 +++++++++--------- .../CoursewareStructuralElementDialogAdd.vue | 67 +++++++++-------- .../courseware/unit/CoursewareShelfDialogAdd.vue | 85 ++++++++++++---------- 3 files changed, 118 insertions(+), 106 deletions(-) diff --git a/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue b/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue index dba1917..57bd762 100644 --- a/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue +++ b/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue @@ -281,41 +281,43 @@ - - - + diff --git a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAdd.vue b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAdd.vue index 9ba6c77..78abfcf 100644 --- a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAdd.vue +++ b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAdd.vue @@ -113,33 +113,35 @@ - - - + @@ -249,6 +251,9 @@ export default { hasTemplates() { return this.templates.length > 0; }, + purposeIsOer() { + return this.purpose === 'oer'; + }, }, methods: { ...mapActions({ @@ -302,10 +307,10 @@ export default { payload: { description: this.description, color: this.color, - license_type: this.license_type, - required_time: this.required_time, - difficulty_start: this.difficulty_start, - difficulty_end: this.difficulty_end, + license_type: this.purposeIsOer ? this.license_type : '', + required_time: this.purposeIsOer ? this.required_time : '', + difficulty_start: this.purposeIsOer ? this.difficulty_start : '', + difficulty_end: this.purposeIsOer ? this.difficulty_end : '', }, }, templateId: this.selectedTemplate ? this.selectedTemplate.id : null, diff --git a/resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue b/resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue index 6546552..6eadc06 100644 --- a/resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue +++ b/resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue @@ -91,41 +91,43 @@ - - - + @@ -183,7 +185,10 @@ export default { }, colors() { return this.mixinColors.filter(color => color.darkmode); - } + }, + purposeIsOer() { + return this.addWizardData.purpose === 'oer'; + }, }, mounted() { this.initAddWizardData(); @@ -243,10 +248,10 @@ export default { payload: { description: this.addWizardData.description, color: this.addWizardData.color, - license_type: this.addWizardData.license_type, - required_time: this.addWizardData.required_time, - difficulty_start: this.addWizardData.difficulty_start, - difficulty_end: this.addWizardData.difficulty_end + license_type: this.purposeIsOer ? this.addWizardData.license_type : '', + required_time: this.purposeIsOer ? this.addWizardData.required_time : '', + difficulty_start: this.purposeIsOer ? this.addWizardData.difficulty_start : '', + difficulty_end: this.purposeIsOer ? this.addWizardData.difficulty_end : '' } }, relationships: { -- cgit v1.0