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

Fix me mixin

This commit is contained in:
Ramon Wenger 2023-02-07 17:51:51 +01:00
parent 6ecf33d12b
commit c2f7961d18
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/ContentBlock.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div <div
:class="{ 'hideable-element--greyed-out': hidden }" :class="{ 'hideable-element--greyed-out': isHidden }"
class="content-block__container hideable-element content-list__parent" class="content-block__container hideable-element content-list__parent"
> >
<div <div
@ -230,7 +230,7 @@ export default {
contents: newContent, contents: newContent,
}); });
}, },
hidden() { isHidden() {
return hidden({ return hidden({
block: this.contentBlock, block: this.contentBlock,
schoolClass: this.schoolClass, schoolClass: this.schoolClass,

20
client/src/mixins/me.js
View File

@ -18,30 +18,34 @@ export default {
computed: { computed: {
topicRoute() { topicRoute() {
if (this.me.lastTopic && this.me.lastTopic.slug) { if (this.$data.me.lastTopic && this.$data.me.lastTopic.slug) {
return { return {
name: 'topic', name: 'topic',
params: { params: {
topicSlug: this.me.lastTopic.slug, topicSlug: this.$data.me.lastTopic.slug,
}, },
}; };
} }
return '/book/topic/berufliche-grundbildung'; return '/book/topic/berufliche-grundbildung';
}, },
schoolClass() { schoolClass() {
return this.me.selectedClass; return this.$data.me.selectedClass;
}, },
canManageContent() { canManageContent() {
return this.me.isTeacher; return this.$data.me.isTeacher;
}, },
isReadOnly() { isReadOnly() {
return this.me.readOnly || this.me.selectedClass.readOnly; return this.$data.me.readOnly || this.$data.me.selectedClass.readOnly;
}, },
currentClassName() { currentClassName() {
let currentClass = this.me.schoolClasses.find((schoolClass) => { let currentClass = this.$data.me.schoolClasses.find((schoolClass) => {
return schoolClass.id === this.me.selectedClass.id; return schoolClass.id === this.$data.me.selectedClass.id;
}); });
return currentClass ? currentClass.name : this.me.schoolClasses.length ? this.me.schoolClasses[0].name : ''; return currentClass
? currentClass.name
: this.$data.me.schoolClasses.length
? this.$data.me.schoolClasses[0].name
: '';
}, },
}, },