ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix exporting of selected motions

Browse Source 
Fixes an issue where the export button has been put in the
wrong view
This commit is contained in:
Sean Engelhardt 2019-04-15 15:28:03 +02:00
parent a831ccd2b2
commit 8a40ee3cbc
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
View File

@ -93,10 +93,6 @@
<span translate>Show entire motion text</span> <span translate>Show entire motion text</span>
</button> </button>
<div *ngIf="perms.isAllowed('manage')"> <div *ngIf="perms.isAllowed('manage')">
<button mat-menu-item [disabled]="!selectedRows.length" (click)="openExportDialog()">
<mat-icon>archive</mat-icon>
<span translate>Export selected motions</span>
</button>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<!-- Delete --> <!-- Delete -->
<button mat-menu-item class="red-warning-text" (click)="deleteMotionButton()"> <button mat-menu-item class="red-warning-text" (click)="deleteMotionButton()">

40
client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
View File

@ -221,11 +221,19 @@
</button> </button>
<div *ngIf="perms.isAllowed('change_metadata')"> <div *ngIf="perms.isAllowed('change_metadata')">
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button mat-menu-item [disabled]="!selectedRows.length" (click)="multiselectWrapper(multiselectService.bulkSetFavorite(selectedRows))"> <button
mat-menu-item
[disabled]="!selectedRows.length"
(click)="multiselectWrapper(multiselectService.bulkSetFavorite(selectedRows))"
>
<mat-icon>star</mat-icon> <mat-icon>star</mat-icon>
<span translate>Set/unset Favorite</span> <span translate>Set/unset Favorite</span>
</button> </button>
<button mat-menu-item [disabled]="!selectedRows.length" (click)="multiselectWrapper(multiselectService.setStateOfMultiple(selectedRows))"> <button
mat-menu-item
[disabled]="!selectedRows.length"
(click)="multiselectWrapper(multiselectService.setStateOfMultiple(selectedRows))"
>
<mat-icon>label</mat-icon> <mat-icon>label</mat-icon>
<span translate>Set status</span> <span translate>Set status</span>
</button> </button>
@ -260,9 +268,11 @@
<span translate>Set motion block</span> <span translate>Set motion block</span>
</button> </button>
<button mat-menu-item <button
[disabled]="!selectedRows.length" mat-menu-item
(click)="multiselectWrapper(multiselectService.changeSubmitters(selectedRows))"> [disabled]="!selectedRows.length"
(click)="multiselectWrapper(multiselectService.changeSubmitters(selectedRows))"
>
<mat-icon>person_add</mat-icon> <mat-icon>person_add</mat-icon>
<!-- TODO: icon --> <!-- TODO: icon -->
<span translate>Add/remove submitters</span> <span translate>Add/remove submitters</span>
@ -277,20 +287,28 @@
<!-- TODO: icon --> <!-- TODO: icon -->
<span translate>Add/remove tags</span> <span translate>Add/remove tags</span>
</button> </button>
<button mat-menu-item <button
[disabled]="!selectedRows.length" mat-menu-item
(click)="multiselectWrapper(multiselectService.moveToItem(selectedRows))"> [disabled]="!selectedRows.length"
(click)="multiselectWrapper(multiselectService.moveToItem(selectedRows))"
>
<mat-icon>sort</mat-icon> <mat-icon>sort</mat-icon>
<span translate>Move to agenda item</span> <span translate>Move to agenda item</span>
</button> </button>
<button mat-menu-item <button
[disabled]="!selectedRows.length" mat-menu-item
(click)="multiselectWrapper(multiselectService.bulkMoveItems(selectedRows))"> [disabled]="!selectedRows.length"
(click)="multiselectWrapper(multiselectService.bulkMoveItems(selectedRows))"
>
<mat-icon>format_indent_increase</mat-icon> <mat-icon>format_indent_increase</mat-icon>
<span translate>Move in call list</span> <span translate>Move in call list</span>
</button> </button>
</div> </div>
<div *ngIf="perms.isAllowed('manage')"> <div *ngIf="perms.isAllowed('manage')">
<button mat-menu-item [disabled]="!selectedRows.length" (click)="openExportDialog()">
<mat-icon>archive</mat-icon>
<span translate>Export selected motions</span>
</button>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button <button
mat-menu-item mat-menu-item