From 7965631ee97849efa94301e375f70668c9d084d2 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 21 Oct 2022 07:19:18 +0000
Subject: [PATCH] Biest #1651
Closes #1651
Merge request studip/studip!1098
---
.../components/courseware/CoursewareActionWidget.vue | 3 ++-
.../courseware/CoursewareStructuralElement.vue | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/resources/vue/components/courseware/CoursewareActionWidget.vue b/resources/vue/components/courseware/CoursewareActionWidget.vue
index 61d31afd5d7..d165d784239 100644
--- a/resources/vue/components/courseware/CoursewareActionWidget.vue
+++ b/resources/vue/components/courseware/CoursewareActionWidget.vue
@@ -17,7 +17,7 @@
{{ $gettext('Seite bearbeiten') }}
</button>
</li>
- <li v-if="canEdit && blockedByAnotherUser" class="cw-action-widget-remove-lock">
+ <li v-if="canEdit && blockedByAnotherUser && userIsTeacher" class="cw-action-widget-remove-lock">
<button @click="removeElementLock">
{{ $gettext('Sperre aufheben') }}
</button>
@@ -79,6 +79,7 @@ export default {
computed: {
...mapGetters({
userId: 'userId',
+ userIsTeacher: 'userIsTeacher',
consumeMode: 'consumeMode',
showToolbar: 'showToolbar',
context: 'context',
diff --git a/resources/vue/components/courseware/CoursewareStructuralElement.vue b/resources/vue/components/courseware/CoursewareStructuralElement.vue
index 4110936f211..6c6c0e517a2 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElement.vue
@@ -76,13 +76,13 @@
}"
>
<div v-if="structuralElementLoaded" class="cw-companion-box-wrapper">
- <courseware-companion-box
+ <courseware-companion-box
v-if="blockedByAnotherUser"
:msgCompanion="$gettextInterpolate('Die Einstellungen dieser Seite werden im Moment von %{blockingUserName} bearbeitet', {blockingUserName: blockingUserName})"
mood="pointing"
>
<template #companionActions>
- <button class="button" @click="menuAction('removeLock')">
+ <button v-if="userIsTeacher" class="button" @click="menuAction('removeLock')">
{{ textRemoveLock.title }}
</button>
</template>
@@ -946,7 +946,7 @@ export default {
];
if (this.canEdit) {
- if (!this.blocked) {
+ if (!this.blockedByAnotherUser) {
menu.push({
id: 1,
label: this.$gettext('Seite bearbeiten'),
@@ -959,8 +959,8 @@ export default {
icon: 'arr_1sort',
emit: 'sortContainers',
});
- }
- if (this.blocked && this.blockedByAnotherUser && this.userIsTeacher) {
+ }
+ if (this.blockedByAnotherUser && this.userIsTeacher) {
menu.push({
id: 1,
label: this.textRemoveLock.title,
--
GitLab