ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'hotfix/selected-class-type-error' into develop

This commit is contained in:
Ramon Wenger 2023-07-27 17:49:03 +02:00
parent 526faac179 94b9b5f03b
commit 5dd7958334
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/ReadOnlyBanner.vue
View File

@ -2,7 +2,7 @@
<div
class="read-only-banner"
data-cy="read-only-banner"
v-if="me.readOnly || me.selectedClass.readOnly"
v-if="isReadOnly"
>
<div class="read-only-banner__content">
<p class="read-only-banner__text">{{ readOnlyText }} Sie können Inhalte lesen, aber nicht bearbeiten.</p>
@ -76,6 +76,9 @@ export default {
readOnlyText() {
return this.me.readOnly ? 'Sie besitzen keine aktive Lizenz.' : 'Sie sind in dieser Klasse nicht mehr aktiv.';
},
isReadOnly() {
return this.me.readOnly || this.me.selectedClass?.readOnly;
},
},
};
</script>

2
client/src/components/content-blocks/assignment/Assignment.vue
View File

@ -21,7 +21,7 @@
:spellcheck-loading="spellcheckLoading"
:saved="!unsaved"
:spellcheck="true"
:read-only="me.readOnly || me.selectedClass.readOnly"
:read-only="me.readOnly || me.selectedClass?.readOnly"
placeholder="Ergebnis erfassen"
action="Ergebnis mit Lehrperson teilen"
shared-msg="Das Ergebnis wurde mit der Lehrperson geteilt."

2
client/src/components/modules/ModuleNavigation.vue
View File

@ -13,7 +13,7 @@
<div
class="module-navigation__toggle-menu"
data-cy="module-teacher-menu"
v-if="canManageContent && !me.readOnly && !me.selectedClass.readOnly"
v-if="canManageContent && !me.readOnly && !me.selectedClass?.readOnly"
>
<snapshot-menu class="module-navigation__actions" />
<router-link

2
client/src/components/rooms/RoomWidget.vue
View File

@ -57,7 +57,7 @@ export default {
return `room-widget--${this.appearance}`;
},
canEditRoom() {
return this.me.isTeacher && !this.me.readOnly && !this.me.selectedClass.readOnly;
return this.me.isTeacher && !this.me.readOnly && !this.me.selectedClass?.readOnly;
},
},

2
client/src/mixins/me.ts
View File

@ -66,7 +66,7 @@ const getCanManageContent = (me: Me): boolean => {
};
const getIsReadOnly = (me: Me): boolean => {
return me.readOnly || me.selectedClass.readOnly;
return me.readOnly || me.selectedClass?.readOnly;
};
const getCurrentClassName = (me: Me) => {

4
client/src/pages/myClass.vue
View File

@ -8,7 +8,7 @@
:show-code-route="showCodeRoute"
:read-only="me.readOnly"
:can-edit="me.isTeacher"
:enable-deactivate="!me.readOnly && !me.selectedClass.readOnly"
:enable-deactivate="!me.readOnly && !me.selectedClass?.readOnly"
title="Klassenliste"
class="my-class__class"
@add="add"
@ -72,7 +72,7 @@ export default {
];
// if we changed the currently selected class of the logged in user, we need to change this property too
const readOnly = member.isMe ? !active : me.selectedClass.readOnly;
const readOnly = member.isMe ? !active : me.selectedClass?.readOnly;
const data = {
me: {
...me,

4
client/src/pages/portfolio/project.vue
View File

@ -46,7 +46,7 @@
:project="project.slug"
class="project__add-entry"
data-cy="add-project-entry"
v-if="isOwner && !me.readOnly && !me.selectedClass.readOnly"
v-if="canEdit"
/>
<project-entry
v-bind="entry"
@ -115,7 +115,7 @@ export default {
return this.project.entries ? this.project.entries.length : 0;
},
canEdit() {
return !this.me.readOnly && !this.me.selectedClass.readOnly && this.isOwner;
return !this.me.readOnly && !this.me.selectedClass?.readOnly && this.isOwner;
},
},

2
client/src/pages/studentSubmission.vue
View File

@ -108,7 +108,7 @@ export default {
};
},
readOnly() {
return this.me.readOnly || this.me.selectedClass.readOnly;
return this.me.readOnly || this.me.selectedClass?.readOnly;
},
assignmentText() {
const text = this.studentSubmission.assignment.assignment;