fix #889biest-889

4 files changed, 19 insertions, 8 deletions

diff --git a/resources/vue/components/courseware/ActivitiesApp.vue b/resources/vue/components/courseware/ActivitiesApp.vue
index cfbce77..2d2f452 100644
--- a/resources/vue/components/courseware/ActivitiesApp.vue
+++ b/resources/vue/components/courseware/ActivitiesApp.vue
@@ -14,18 +14,12 @@
 import CoursewareActivities from './CoursewareActivities.vue';
 import CoursewareActivitiesWidgetFilterType from './widgets/CoursewareActivitiesWidgetFilterType.vue';
 import CoursewareActivitiesWidgetFilterUnit from './widgets/CoursewareActivitiesWidgetFilterUnit.vue';
-import { mapGetters } from 'vuex';
 
 export default {
     components: {
         CoursewareActivities,
         CoursewareActivitiesWidgetFilterType,
         CoursewareActivitiesWidgetFilterUnit
-    },
-    computed: {
-        ...mapGetters({
-            userIsTeacher: 'userIsTeacher',
-        }),
-    },
+    }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/vue/components/courseware/CoursewareCommentsOverviewDialog.vue b/resources/vue/components/courseware/CoursewareCommentsOverviewDialog.vue
index d157f5b..ba69db4 100644
--- a/resources/vue/components/courseware/CoursewareCommentsOverviewDialog.vue
+++ b/resources/vue/components/courseware/CoursewareCommentsOverviewDialog.vue
@@ -25,6 +25,7 @@
             <courseware-structural-element-feedback
                 v-if="isStructuralElement && isFeedback"
                 :structuralElement="item"
+                :canEdit="item.attributes['can-edit']"
             />
         </template>
     </studip-dialog>
diff --git a/resources/vue/components/courseware/IndexApp.vue b/resources/vue/components/courseware/IndexApp.vue
index 53238b4..59348d3 100644
--- a/resources/vue/components/courseware/IndexApp.vue
+++ b/resources/vue/components/courseware/IndexApp.vue
@@ -96,6 +96,7 @@ export default {
             invalidateStructureCache: 'courseware-structure/invalidateCache',
             loadCoursewareStructure: 'courseware-structure/load',
             loadStructuralElement: 'loadStructuralElement',
+            loadTeacherStatus: 'loadTeacherStatus',
         }),
         async selectStructuralElement(id) {
             if (!id) {
@@ -128,6 +129,11 @@ export default {
         }
 
         this.structureLoadingState = 'done';
+
+        if (this.context.type === 'courses') {
+            this.loadTeacherStatus();
+        }
+
         const selectedId = this.$route.params?.id;
         await this.selectStructuralElement(selectedId);
     },
diff --git a/resources/vue/components/courseware/ShelfApp.vue b/resources/vue/components/courseware/ShelfApp.vue
index 173be71..7ec3685 100644
--- a/resources/vue/components/courseware/ShelfApp.vue
+++ b/resources/vue/components/courseware/ShelfApp.vue
@@ -64,5 +64,15 @@ export default {
         }
 
     },
+    methods: {
+        ...mapActions({
+            loadTeacherStatus: 'loadTeacherStatus'
+        }),
+    },
+    mounted() {
+        if (this.inCourseContext) {
+            this.loadTeacherStatus();
+        }
+    }
 }
 </script>