From 28708ceb420eebf9fac539b7852fb9fad20778eb Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 14 May 2021 18:39:58 +0200 Subject: [PATCH 01/10] InactiveCollaboratorListItem.vue: add UserAvatar to components and imports --- frontend/src/components/camp/InactiveCollaboratorListItem.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/camp/InactiveCollaboratorListItem.vue b/frontend/src/components/camp/InactiveCollaboratorListItem.vue index f5a89be20f..36d850992d 100644 --- a/frontend/src/components/camp/InactiveCollaboratorListItem.vue +++ b/frontend/src/components/camp/InactiveCollaboratorListItem.vue @@ -44,10 +44,11 @@ import IconButton from '@/components/buttons/IconButton.vue' import ButtonDelete from '@/components/buttons/ButtonDelete.vue' import DialogEntityDelete from '@/components/dialog/DialogEntityDelete.vue' +import UserAvatar from '@/components/user/UserAvatar.vue' export default { name: 'InactiveCollaboratorListItem', - components: { IconButton, ButtonDelete, DialogEntityDelete }, + components: { IconButton, ButtonDelete, DialogEntityDelete, UserAvatar }, props: { collaborator: { type: Object, required: true } } From 2d51ede4101d04a934bd3f0ea851d57207932888 Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 14 May 2021 18:41:08 +0200 Subject: [PATCH 02/10] CollaboratorListItem.vue: add IconButton to components and imports --- frontend/src/components/camp/CollaboratorListItem.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue index 53b6e9b42f..9cee044740 100644 --- a/frontend/src/components/camp/CollaboratorListItem.vue +++ b/frontend/src/components/camp/CollaboratorListItem.vue @@ -50,11 +50,12 @@ diff --git a/frontend/src/components/activity/DraggableContentNodes.vue b/frontend/src/components/activity/DraggableContentNodes.vue index 0c5c51dd67..699b7eecb0 100644 --- a/frontend/src/components/activity/DraggableContentNodes.vue +++ b/frontend/src/components/activity/DraggableContentNodes.vue @@ -15,7 +15,8 @@ class="content-node" :content-node="allContentNodesById[id]" :layout-mode="layoutMode" - :draggable="draggingEnabled" /> + :draggable="draggingEnabled" + :disabled="disabled" /> + :parent-content-node="contentNode" + :disabled="disabled" /> diff --git a/frontend/src/components/activity/content/Notes.vue b/frontend/src/components/activity/content/Notes.vue index 607881ab5e..0e0188bd09 100644 --- a/frontend/src/components/activity/content/Notes.vue +++ b/frontend/src/components/activity/content/Notes.vue @@ -7,7 +7,7 @@ :label="$tc('contentNode.notes.name')" rows="4" auto-grow - :disabled="layoutMode" + :disabled="layoutMode || disabled" :filled="layoutMode" /> diff --git a/frontend/src/components/activity/content/SafetyConcept.vue b/frontend/src/components/activity/content/SafetyConcept.vue index dc069fa207..258125de91 100644 --- a/frontend/src/components/activity/content/SafetyConcept.vue +++ b/frontend/src/components/activity/content/SafetyConcept.vue @@ -6,7 +6,7 @@ fieldname="text" :placeholder="$tc('contentNode.safetyConcept.name')" rows="2" - :disabled="layoutMode" + :disabled="layoutMode || disabled" :filled="layoutMode" /> diff --git a/frontend/src/components/activity/content/Storyboard.vue b/frontend/src/components/activity/content/Storyboard.vue index d911729df5..05330c2d10 100644 --- a/frontend/src/components/activity/content/Storyboard.vue +++ b/frontend/src/components/activity/content/Storyboard.vue @@ -14,7 +14,7 @@ - + @@ -22,7 +22,7 @@ fieldname="column1" auto-grow rows="2" - :disabled="layoutMode" + :disabled="layoutMode || disabled" :filled="layoutMode" /> @@ -30,7 +30,7 @@ fieldname="column2" auto-grow rows="4" - :disabled="layoutMode" + :disabled="layoutMode || disabled" :filled="layoutMode" /> @@ -38,11 +38,11 @@ fieldname="column3" auto-grow rows="2" - :disabled="layoutMode" + :disabled="layoutMode || disabled" :filled="layoutMode" /> - +
@@ -85,7 +85,7 @@ -
diff --git a/frontend/src/components/form/api/ApiSortable.vue b/frontend/src/components/form/api/ApiSortable.vue index 45e4b14054..1883ff4182 100644 --- a/frontend/src/components/form/api/ApiSortable.vue +++ b/frontend/src/components/form/api/ApiSortable.vue @@ -5,6 +5,7 @@ handle=".drag-and-drop-handle" :animation="200" :force-fallback="true" + :disabled="disabled" @sort="onSort" @start="dragging = true" @end="dragging = false"> @@ -30,7 +31,8 @@ export default { }, props: { /* reference to sortable API collection */ - collection: { type: Function, required: true } + collection: { type: Function, required: true }, + disabled: { type: Boolean, default: false } }, data () { return { diff --git a/frontend/src/components/material/MaterialTable.vue b/frontend/src/components/material/MaterialTable.vue index 1caa04fad3..d471610dd4 100644 --- a/frontend/src/components/material/MaterialTable.vue +++ b/frontend/src/components/material/MaterialTable.vue @@ -37,7 +37,7 @@