From bd9d93061d3b8ea1425bd22900b8207b242527f7 Mon Sep 17 00:00:00 2001 From: GabrielMeyer Date: Wed, 4 Sep 2019 12:04:33 +0200 Subject: [PATCH] Fixes permissions for motion-blocks - Only users with permission `motions.can_manage` can remove motions from motion-block. --- .../motion-block-detail.component.html | 1 + .../motion-block-detail.component.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html index 907702532..3f6e076a2 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html @@ -33,6 +33,7 @@ [repo]="motionRepo" [filterService]="filterService" [columns]="tableColumnDefinition" + [restricted]="restrictedColumns" [filterProps]="filterProps" (dataSourceChange)="onDataSourceChange($event)" > diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts index 50758113c..1d39cf1d3 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.ts @@ -14,6 +14,7 @@ import { MotionBlockRepositoryService } from 'app/core/repositories/motions/moti import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { ColumnRestriction } from 'app/shared/components/list-view-table/list-view-table.component'; import { MotionBlock } from 'app/shared/models/motions/motion-block'; import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; import { BaseListViewComponent } from 'app/site/base/base-list-view'; @@ -71,6 +72,15 @@ export class MotionBlockDetailComponent extends BaseListViewComponent