From 48593acc25168f1903c2ad7c87edaafbcaa24f58 Mon Sep 17 00:00:00 2001 From: Maximilian Krambach Date: Fri, 12 Apr 2019 13:57:22 +0200 Subject: [PATCH 1/2] disable multiselect options if nothing selected --- .../agenda-list/agenda-list.component.html | 14 +++++----- .../assignment-list.component.html | 3 +- .../mediafile-list.component.html | 9 ++++-- .../motion-list/motion-list.component.html | 23 +++++++++++---- .../user-list/user-list.component.html | 28 +++++++++++++------ 5 files changed, 52 insertions(+), 25 deletions(-) diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html index 5d627959a..162df2237 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html @@ -169,20 +169,20 @@ -
- - @@ -190,26 +190,26 @@ - - - - diff --git a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html index 65ec6778d..95ee37df7 100644 --- a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html +++ b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html @@ -95,7 +95,7 @@ done_all Select all - @@ -104,6 +104,7 @@ mat-menu-item class="red-warning-text" *osPerms="'assignment.can_manage'" + [disabled]="!selectedRows.length" (click)="deleteSelected()" > delete diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html index e02bcf84b..3c964aa97 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html @@ -196,12 +196,17 @@ done_all Select all - - diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html index c0ec1d13d..a48172237 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html +++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html @@ -215,22 +215,23 @@ done_all Select all -
- - - - - @@ -285,6 +295,7 @@ -
-
- @@ -179,34 +184,39 @@
- - - - - - From 7d9ea4e55a12d4d28f2562a6fb54f44fd350b453 Mon Sep 17 00:00:00 2001 From: Maximilian Krambach Date: Fri, 12 Apr 2019 13:59:50 +0200 Subject: [PATCH 2/2] multiselect motion export --- .../motion-detail.component.html | 32 ++++++++++++------- .../motion-list/motion-list.component.ts | 15 ++++----- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html index 787c5cc74..aa40b77a0 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html @@ -92,8 +92,11 @@ {{ !showAmendmentContext ? 'check_box_outline_blank' : 'check_box' }} Show entire motion text -
+