From c9dc702e08b4f278776b3d702746eff187fe3bc5 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 18 Mar 2024 13:40:15 +0000
Subject: [PATCH] fix vue-warnings, re #3829
Merge request studip/studip!2694
---
resources/vue/components/FilesTable.vue | 8 ++---
.../components/StudipMultiPersonSearch.vue | 4 +--
.../blocks/CoursewareKeyPointBlock.vue | 2 +-
.../containers/CoursewareContainerActions.vue | 2 +-
.../CoursewareStructuralElement.vue | 33 +++++++++----------
5 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index c521d1e890f..646e9146f73 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -121,7 +121,7 @@
</td>
<td class="document-icon">
<a :href="folder.url" :id="`folder-${folder.id}`">
- <studip-icon :shape="folder.icon" role="clickable" size="26" class="text-bottom"></studip-icon>
+ <studip-icon :shape="folder.icon" :size="26" class="text-bottom"></studip-icon>
</a>
</td>
<td :class="{'filter-match': valueMatchesFilter(folder.name)}">
@@ -173,9 +173,9 @@
</td>
<td class="document-icon">
<a v-if="file.download_url" :href="file.download_url" target="_blank" rel="noopener noreferrer">
- <studip-icon :shape="file.icon" role="clickable" size="24" class="text-bottom"></studip-icon>
+ <studip-icon :shape="file.icon" :size="24" class="text-bottom"></studip-icon>
</a>
- <studip-icon v-else :shape="file.icon" role="clickable" size="24"></studip-icon>
+ <studip-icon v-else :shape="file.icon" :size="24"></studip-icon>
<a :href="file.download_url"
v-if="file.download_url && file.mime_type.indexOf('image/') === 0"
@@ -188,7 +188,6 @@
<studip-icon v-if="file.isAccessible"
shape="accessibility"
role="info"
- size="16"
style="vertical-align: text-bottom"
:title="$gettext('Diese Datei ist barrierefrei.')"></studip-icon>
</a>
@@ -196,7 +195,6 @@
<studip-icon v-if="file.restrictedTermsOfUse"
shape="lock-locked"
role="info"
- size="16"
:title="$gettext('Das Herunterladen dieser Datei ist nur eingeschränkt möglich.')"></studip-icon>
</td>
diff --git a/resources/vue/components/StudipMultiPersonSearch.vue b/resources/vue/components/StudipMultiPersonSearch.vue
index be71cd7e238..5218a76e8c4 100644
--- a/resources/vue/components/StudipMultiPersonSearch.vue
+++ b/resources/vue/components/StudipMultiPersonSearch.vue
@@ -4,10 +4,10 @@
<label class="with-action">
<input type="text" ref="searchInputField" v-model="searchTerm" :placeholder="$gettext('Suchen')" style="width: 260px;">
<a href="#" class="msp-btn" @click.prevent="search" :title="$gettext('Suche starten')">
- <studip-icon shape="search" role="clickable" size="16"></studip-icon>
+ <studip-icon shape="search" />
</a>
<a href="#" class="msp-btn" @click.prevent="resetSearch" :title="$gettext('Suche zurücksetzen')">
- <studip-icon shape="decline" role="clickable" size="16"></studip-icon>
+ <studip-icon shape="decline" />
</a>
</label>
<select multiple="multiple" :id="select_box_id" name="selectbox[]"></select>
diff --git a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
index ab79edc3d46..a4107408635 100644
--- a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
@@ -11,7 +11,7 @@
>
<template #content>
<div class="cw-keypoint-content" :class="['cw-keypoint-' + currentColor]">
- <studip-icon v-if="currentIcon" size="48" :shape="currentIcon" :role="currentRole" />
+ <studip-icon v-if="currentIcon" :size="48" :shape="currentIcon" :role="currentRole" />
<p class="cw-keypoint-sentence">{{ currentText }}</p>
</div>
</template>
diff --git a/resources/vue/components/courseware/containers/CoursewareContainerActions.vue b/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
index 2480abaaeee..79379bfcae8 100644
--- a/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
+++ b/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
@@ -50,7 +50,7 @@ export default {
if (this.blocked && this.blockedByAnotherUser && this.userIsTeacher) {
menuItems.push({
- id: 3,
+ id: 4,
label: this.$gettext('Sperre aufheben'),
icon: 'lock-unlocked',
emit: 'removeLock',
diff --git a/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue b/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue
index 609d5ca25ec..10b884b1ef1 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue
@@ -160,7 +160,7 @@
class="cw-container-item"
/>
</div>
-
+
<div
v-if="isLink"
class="cw-container-wrapper"
@@ -231,7 +231,7 @@
<studip-progress-indicator v-if="processing" :description="$gettext('Vorgang wird bearbeitet...')" />
</div>
</div>
- <courseware-toolbar v-if="canVisit && canEdit && !isLink" />
+ <courseware-toolbar v-if="canVisit && canEdit && !isLink" />
</div>
<courseware-call-to-action-box
v-if="commentable"
@@ -857,7 +857,7 @@ export default {
if (this.parent) {
return this.childrenById(this.parent.id).length;
}
-
+
return 0;
},
@@ -933,7 +933,7 @@ export default {
return true;
}
}
-
+
return false;
},
@@ -1125,13 +1125,13 @@ export default {
menuItems() {
let menu = [
- { id: 4, label: this.$gettext('Informationen anzeigen'), icon: 'info', emit: 'showInfo' },
- { id: 5, label: this.$gettext('Lesezeichen setzen'), icon: 'star', emit: 'setBookmark' },
+ { id: 5, label: this.$gettext('Informationen anzeigen'), icon: 'info', emit: 'showInfo' },
+ { id: 6, label: this.$gettext('Lesezeichen setzen'), icon: 'star', emit: 'setBookmark' },
];
if (this.isFeedbackActivated) {
if (this.canCreateFeedbackElement && !this.hasFeedbackElement) {
menu.push({
- id: 6,
+ id: 7,
label: this.$gettext('Feedback aktivieren'),
icon: 'feedback',
emit: 'showFeedbackCreate',
@@ -1139,7 +1139,7 @@ export default {
}
if (this.hasFeedbackElement) {
menu.push({
- id: 6,
+ id: 7,
label: this.$gettext('Feedback anzeigen'),
icon: 'feedback',
emit: 'showFeedback',
@@ -1149,14 +1149,14 @@ export default {
if (this.oerEnableSuggestions && this.inCourse && this.userId !== this.structuralElement.relationships.owner.data.id) {
menu.push(
- { id: 7, label: this.$gettext('Seite für OER Campus vorschlagen'), icon: 'oer-campus',
+ { id: 8, label: this.$gettext('Seite für OER Campus vorschlagen'), icon: 'oer-campus',
emit: 'showSuggest' }
);
}
if (!document.documentElement.classList.contains('responsive-display')) {
menu.push(
- { id: 8, label: this.$gettext('Als Vollbild anzeigen'), icon: 'screen-full',
+ { id: 9, label: this.$gettext('Als Vollbild anzeigen'), icon: 'screen-full',
emit: 'activateFullscreen'},
);
}
@@ -1196,14 +1196,14 @@ export default {
emit: 'removeLock',
});
}
- menu.push({ id: 3, label: this.$gettext('Seite hinzufügen'), icon: 'add', emit: 'addElement' });
+ menu.push({ id: 4, label: this.$gettext('Seite hinzufügen'), icon: 'add', emit: 'addElement' });
}
if (this.context.type === 'users') {
- menu.push({ id: 9, label: this.$gettext('Öffentlichen Link erzeugen'), icon: 'group', emit: 'linkElement' });
+ menu.push({ id: 10, label: this.$gettext('Öffentlichen Link erzeugen'), icon: 'group', emit: 'linkElement' });
}
if (this.deletable && this.canEdit && !this.isTask && !this.blocked) {
menu.push({
- id: 10,
+ id: 11,
label: this.$gettext('Seite löschen'),
icon: 'trash',
emit: 'deleteCurrentElement',
@@ -1913,11 +1913,11 @@ export default {
await this.loadFeedbackElement({ id: feedbackElementId, options: { include: 'entries' }});
ratingPopupFeedbackElement = this.getFeedbackElementById({ id: feedbackElementId });
const hasUserEntry = this.feedbackEntries.filter(
- (entry) =>
+ (entry) =>
parseInt(entry.relationships?.['feedback-element']?.data?.id) == feedbackElementId &&
this.currentUser.id === entry.relationships?.author?.data?.id
).length > 0;
-
+
if (this.currentUser.id !== ratingPopupFeedbackElement?.relationships?.author?.data?.id && !hasUserEntry) {
showRatingPopup = true;
} else {
@@ -1938,7 +1938,7 @@ export default {
return this.structuralElementById({ id: elem.id });
}
const parent = this.structuralElementById({ id: parentId });
-
+
return this.findFirstLevelParent(parent);
},
submitFeedback() {
@@ -2007,4 +2007,3 @@ export default {
}),
};
</script>
-
--
GitLab