Merge pull request #4481 from tsiegleauq/speaker-list-perms

Prevent drag and final versions without perms

client/src/app/shared/components/sorting-list/sorting-list.component.html

@@ -1,9 +1,9 @@
-<div cdkDropList class="os-card" (cdkDropListDropped)="drop($event)">
+<div cdkDropList class="os-card" [cdkDropListDisabled]="!enable" (cdkDropListDropped)="drop($event)">
     <div class="box line" *ngIf="!array.length">
         <span translate>No data</span>
     </div>
     <div class="box line" *ngFor="let item of array; let i = index" cdkDrag>
-        <div class="section-one" cdkDragHandle>
+        <div class="section-one" cdkDragHandle *ngIf="enable">
             <mat-icon>drag_indicator</mat-icon>
         </div>
         <div class="section-two">

client/src/app/shared/components/sorting-list/sorting-list.component.ts

@@ -59,6 +59,12 @@ export class SortingListComponent implements OnInit, OnDestroy {
     @Input()
     public count = false;
 
+    /**
+     * Can be set to false to disable drag n drop
+     */
+    @Input()
+    public enable = true;
+
     /**
      * The Input List Values
      *

client/src/app/shared/directives/perms.directive.ts

@@ -47,6 +47,12 @@ export class PermsDirective implements OnInit, OnDestroy {
      */
     private complement: boolean;
 
+    /**
+     * Add a true-false-condition additional to osPerms
+     * `*osPerms="'motions.can_manage';and:isRecoMode(ChangeRecoMode.Final)"`
+     */
+    private and = true;
+
     private operatorSubscription: Subscription | null;
 
     /**
@@ -110,6 +116,16 @@ export class PermsDirective implements OnInit, OnDestroy {
         this.updateView();
     }
 
+    /**
+     * Comes from the view.
+     * `;and:` turns into osPermsAnd during runtime.
+     */
+    @Input('osPermsAnd')
+    public set osPermsAnd(value: boolean) {
+        this.and = value;
+        this.updateView();
+    }
+
     /**
      * Shows or hides certain content in the view.
      */
@@ -133,7 +149,10 @@ export class PermsDirective implements OnInit, OnDestroy {
      * Returns true if the users permissions fit.
      */
     private checkPermissions(): boolean {
-        const hasPerms = this.permissions.length === 0 || this.operator.hasPerms(...this.permissions);
+        const hasPerms = this.and
+            ? this.permissions.length === 0 || this.operator.hasPerms(...this.permissions)
+            : false;
+
         if (this.complement) {
             return !hasPerms;
         } else {

client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html

@@ -60,7 +60,13 @@
     <!-- Waiting speakers -->
     <div>
         <div class="waiting-list" *ngIf="speakers && speakers.length > 0">
-            <os-sorting-list [input]="speakers" [live]="true" [count]="true" (sortEvent)="onSortingChange($event)">
+            <os-sorting-list
+                [input]="speakers"
+                [live]="true"
+                [count]="true"
+                [enable]="opCanManage()"
+                (sortEvent)="onSortingChange($event)"
+            >
                 <!-- implicit item references into the component using ng-template slot -->
                 <ng-template let-item>
                     <span *osPerms="'agenda.can_manage_list_of_speakers'">

client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts

@@ -176,6 +176,10 @@ export class ListOfSpeakersComponent extends BaseViewComponent implements OnInit
         });
     }
 
+    public opCanManage(): boolean {
+        return this.op.hasPerms('agenda.can_manage_list_of_speakers');
+    }
+
     /**
      * Check the URL to determine a current list of Speakers
      */

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

@@ -495,7 +495,7 @@
                 type="button"
                 mat-icon-button
                 matTooltip="{{ 'Create final print template' | translate }}"
-                *ngIf="isRecoMode(ChangeRecoMode.Final)"
+                *osPerms="'motions.can_manage';and:isRecoMode(ChangeRecoMode.Final)"
                 (click)="createModifiedFinalVersion()"
             >
                 <mat-icon>description</mat-icon>
@@ -878,7 +878,7 @@
     <button
         mat-menu-item
         translate
-        *ngIf="motion?.modified_final_version"
+        *osPerms="'motions.can_manage';and:isRecoMode(ChangeRecoMode.Final)"
         (click)="setChangeRecoMode(ChangeRecoMode.ModifiedFinal)"
         [ngClass]="{ selected: motion?.crMode === ChangeRecoMode.ModifiedFinal }"
     >