Adapt loading checks to changed relation in API

ecamp · Feb 8, 2022 · 17daa28 · 17daa28
1 parent 7ddfdb0
commit 17daa28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/frontend/src/components/camp/CampPrint.vue b/frontend/src/components/camp/CampPrint.vue
@@ -86,10 +86,11 @@ export default {
               return scheduleEntry._meta.loading ||
                 scheduleEntry.activity()._meta.loading ||
                 scheduleEntry.activity().category()._meta.loading ||
-                scheduleEntry.activity().campCollaborations()._meta.loading ||
-                scheduleEntry.activity().campCollaborations().items.some(responsible => {
+                scheduleEntry.activity().activityResponsibles()._meta.loading ||
+                scheduleEntry.activity().activityResponsibles().items.some(responsible => {
                   return responsible._meta.loading ||
-                    (responsible.user() !== null && responsible.user()._meta.loading)
+                    responsible.campCollaboration()._meta.loading ||
+                    (responsible.campCollaboration().user() !== null && responsible.campCollaboration().user()._meta.loading)
                 }) ||
                 scheduleEntry.activity().contentNodes()._meta.loading ||
                 scheduleEntry.activity().contentNodes().items.some(contentNode => {

diff --git a/frontend/src/components/print/picasso/Responsibles.jsx b/frontend/src/components/print/picasso/Responsibles.jsx
@@ -45,7 +45,7 @@ const initialsStyles = {
 }
 
 function Responsibles ({ activity, styles }) {
-  const last = activity.campCollaborations().items.length - 1
+  const last = activity.activityResponsibles().items.length - 1
   return <View style={{ ...avatarsStyles, ...styles }}>
     {activity.activityResponsibles().items.map((activityResponsible, index) => {
       return <View key={activityResponsible.campCollaboration().id} style={{

diff --git a/frontend/src/views/camp/CampProgram.vue b/frontend/src/views/camp/CampProgram.vue
@@ -84,10 +84,11 @@ export default {
               return scheduleEntry._meta.loading ||
                 scheduleEntry.activity()._meta.loading ||
                 scheduleEntry.activity().category()._meta.loading ||
-                scheduleEntry.activity().campCollaborations()._meta.loading ||
-                scheduleEntry.activity().campCollaborations().items.some(responsible => {
+                scheduleEntry.activity().activityResponsibles()._meta.loading ||
+                scheduleEntry.activity().activityResponsibles().items.some(responsible => {
                   return responsible._meta.loading ||
-                    (responsible.user() !== null && responsible.user()._meta.loading)
+                    responsible.campCollaboration()._meta.loading ||
+                    (responsible.campCollaboration().user() !== null && responsible.campCollaboration().user()._meta.loading)
                 })
             })
         })