Merge pull request #4051 from FinnStutzenstein/manage_submitters

Manage submitters

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

@@ -1,6 +1,5 @@
 .list {
-    width: 75%;
+    width: 100%;
-    max-width: 100%;
     border: solid 1px #ccc;
     display: block;
     background: white; // TODO theme
@@ -37,7 +36,7 @@
 
 .line {
     display: table;
-    min-height: 60px;
+    min-height: 50px;
 
     .section-one {
         display: table-cell;

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

@@ -1,8 +1,9 @@
-import { Component, OnInit, Input, Output, EventEmitter, ContentChild, TemplateRef } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, ContentChild, TemplateRef, OnDestroy } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { Selectable } from '../selectable';
 import { EmptySelectable } from '../empty-selectable';
+import { Observable, Subscription } from 'rxjs';
 
 /**
  * Reusable Sorting List
@@ -28,7 +29,7 @@ import { EmptySelectable } from '../empty-selectable';
     templateUrl: './sorting-list.component.html',
     styleUrls: ['./sorting-list.component.scss']
 })
-export class SortingListComponent implements OnInit {
+export class SortingListComponent implements OnInit, OnDestroy {
     /**
      * Sorted and returned
      */
@@ -64,25 +65,38 @@ export class SortingListComponent implements OnInit {
      *
      * If live updates are disabled, new values are processed when the auto update adds
      * or removes relevant objects
+     *
+     * One can pass the values as an array or an observalbe. If the observable is chosen,
+     * every time the observable changes, the array is updated with the rules above.
      */
     @Input()
-    public set input(newValues: Array<Selectable>) {
+    public set input(newValues: Selectable[] | Observable<Selectable[]>) {
         if (newValues) {
-            if (this.array.length !== newValues.length || this.live) {
+            if (this.inputSubscription) {
-                this.array = [];
+                this.inputSubscription.unsubscribe();
-                this.array = newValues.map(val => val);
+            }
-            } else if (this.array.length === 0) {
+            if (newValues instanceof Observable) {
-                this.array.push(new EmptySelectable(this.translate));
+                this.inputSubscription = newValues.subscribe(values => {
+                    this.updateArray(values);
+                })
+            } else {
+                this.inputSubscription = null;
+                this.updateArray(newValues);
             }
         }
     }
 
+    /**
+     * Saves the subscription, if observables are used. Cleared in the onDestroy hook.
+     */
+    private inputSubscription: Subscription | null;
+
     /**
      * Inform the parent view about sorting.
      * Alternative approach to submit a new order of elements
      */
     @Output()
-    public sortEvent = new EventEmitter<Array<Selectable>>();
+    public sortEvent = new EventEmitter<Selectable[]>();
 
     /**
      * Constructor for the sorting list.
@@ -99,6 +113,30 @@ export class SortingListComponent implements OnInit {
      */
     public ngOnInit(): void {}
 
+    /**
+     * Unsubscribe every subscription.
+     */
+    public ngOnDestroy(): void {
+        if (this.inputSubscription) {
+            this.inputSubscription.unsubscribe();
+        }
+    }
+
+    /**
+     * Updates the array with the new data. This is called, if the input changes
+     *
+     * @param newValues The new values to set.
+     */
+    private updateArray(newValues: Selectable[]): void {
+        if (this.array.length !== newValues.length || this.live) {
+            this.array = [];
+            this.array = newValues.map(val => val);
+            console.log(newValues);
+        } else if (this.array.length === 0) {
+            this.array.push(new EmptySelectable(this.translate));
+        }
+    }
+
     /**
      * drop event
      * @param event the event

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

@@ -51,22 +51,20 @@
             <os-sorting-list [input]="speakers" [live]="true" [count]="true" (sortEvent)="onSortingChange($event)">
                 <!-- implicit item references into the component using ng-template slot -->
                 <ng-template let-item>
-                    <div class="speak-action-buttons">
+                    <mat-button-toggle-group>
-                        <mat-button-toggle-group>
+                        <mat-button-toggle matTooltip="{{ 'Begin speech' | translate }}"
-                            <mat-button-toggle matTooltip="{{ 'Begin speech' | translate }}"
+                            (click)="onStartButton(item)">
-                                (click)="onStartButton(item)">
+                            <mat-icon>mic</mat-icon>
-                                <mat-icon>mic</mat-icon>
+                            <span translate>Start</span>
-                                <span translate>Start</span>
+                        </mat-button-toggle>
-                            </mat-button-toggle>
+                        <mat-button-toggle matTooltip="{{ 'Mark speaker' | translate }}"
-                            <mat-button-toggle matTooltip="{{ 'Mark speaker' | translate }}"
+                            (click)="onMarkButton(item)">
-                                (click)="onMarkButton(item)">
+                            <mat-icon>{{ item.marked ? 'star' : 'star_border' }}</mat-icon>
-                                <mat-icon>{{ item.marked ? 'star' : 'star_border' }}</mat-icon>
+                        </mat-button-toggle>
-                            </mat-button-toggle>
+                        <mat-button-toggle matTooltip="{{ 'Remove' | translate }}" (click)="onDeleteButton(item)">
-                            <mat-button-toggle matTooltip="{{ 'Remove' | translate }}" (click)="onDeleteButton(item)">
+                            <mat-icon>close</mat-icon>
-                                <mat-icon>close</mat-icon>
+                        </mat-button-toggle>
-                            </mat-button-toggle>
+                    </mat-button-toggle-group>
-                        </mat-button-toggle-group>
-                    </div>
                 </ng-template>
             </os-sorting-list>
         </div>

client/src/app/site/agenda/components/speaker-list/speaker-list.component.scss

@@ -43,6 +43,7 @@
 
     .waiting-list {
         padding: 10px 25px 0 25px;
+        width: 75%;
     }
 
     form {

client/src/app/site/motions/components/call-list/call-list.component.ts

@@ -1,4 +1,4 @@
-import { Component, ViewChild, EventEmitter } from '@angular/core';
+import { Component, EventEmitter } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { MatSnackBar } from '@angular/material';
 
@@ -8,7 +8,6 @@ import { Observable } from 'rxjs';
 import { BaseViewComponent } from '../../../base/base-view';
 import { MotionRepositoryService } from '../../services/motion-repository.service';
 import { ViewMotion } from '../../models/view-motion';
-import { SortingListComponent } from '../../../../shared/components/sorting-list/sorting-list.component';
 import { OSTreeSortEvent } from 'app/shared/components/sorting-tree/sorting-tree.component';
 import { MotionCsvExportService } from '../../services/motion-csv-export.service';
 
@@ -35,12 +34,6 @@ export class CallListComponent extends BaseViewComponent {
      */
     public readonly expandCollapse: EventEmitter<boolean> = new EventEmitter<boolean>();
 
-    /**
-     * The sort component
-     */
-    @ViewChild('sorter')
-    public sorter: SortingListComponent;
-
     /**
      * Updates the motions member, and sorts it.
      * @param title

client/src/app/site/motions/components/category-list/category-list.component.html

@@ -75,7 +75,7 @@
 
         <!-- Edit form shows during the edit event -->
         <form id="updateForm" [formGroup]='updateForm' *ngIf="editId === category.id" (keydown)="keyDownFunction($event, category)">
-            <span translate>Edit category:</span>:<br>
+            <span translate>Edit category</span>:<br>
 
             <mat-form-field>
                 <input formControlName="prefix" matInput placeholder="{{'Prefix' | translate}}" required>
@@ -99,7 +99,7 @@
                     <li>{{ motion }}</li>
                 </ul>
             </div>
-            <div *ngIf="editId === category.id">
+            <div *ngIf="editId === category.id" class="half-width">
                 <os-sorting-list [input]="motionsInCategory(category)" #sorter></os-sorting-list>
             </div>
         </div>

client/src/app/site/motions/components/category-list/category-list.component.scss

@@ -37,3 +37,7 @@
 #updateForm {
     margin-bottom: 20px;
 }
+
+.half-width {
+    width: 50%;
+}

client/src/app/site/motions/components/manage-submitters/manage-submitters.component.html

@@ -0,0 +1,45 @@
+<h4 translate>
+    <span translate>Submitters</span>
+    <button class="small-button" type="button" mat-icon-button disableRipple *ngIf="!isEditMode" (click)="onEdit()">
+        <mat-icon>edit</mat-icon>
+    </button>
+    <span *ngIf="isEditMode">
+        <button class="small-button" type="button" mat-icon-button disableRipple (click)="onSave()">
+            <mat-icon>save</mat-icon>
+        </button>
+        <button class="small-button" type="button" mat-icon-button disableRipple (click)="onCancel()">
+            <mat-icon>close</mat-icon>
+        </button>
+    </span>
+</h4>
+
+<div *ngIf="!isEditMode">
+    <mat-chip-list *ngFor="let submitter of motion.submitters">
+        <mat-chip>{{ submitter.full_name }}</mat-chip>
+    </mat-chip-list>
+</div>
+<div *ngIf="isEditMode">
+    <mat-card>
+        <form *ngIf="users && users.value.length > 0" [formGroup]="addSubmitterForm">
+            <os-search-value-selector
+                class="search-users"
+                ngDefaultControl
+                [form]="addSubmitterForm"
+                [formControl]="addSubmitterForm.get('userId')"
+                [multiple]="false"
+                listname="{{ 'Select or search new submitter ...' | translate }}"
+                [InputListValues]="users"
+            ></os-search-value-selector>
+        </form>
+
+        <os-sorting-list class="testclass" [input]="editSubmitterObservable" [live]="true" [count]="true" (sortEvent)="onSortingChange($event)">
+            <!-- implicit user references into the component using ng-template slot -->
+            <ng-template let-user>
+                <button type="button" mat-icon-button matTooltip="{{ 'Remove' | translate }}" (click)="onRemove(user)">
+                    <mat-icon>close</mat-icon>
+                </button>
+            </ng-template>
+        </os-sorting-list>
+    </mat-card>
+</div>
+

client/src/app/site/motions/components/manage-submitters/manage-submitters.component.scss

@@ -0,0 +1,21 @@
+.search-users {
+    display: grid;
+    .mat-form-field {
+        width: 100%;
+    }
+}
+
+h4 {
+    margin: 0;
+}
+
+.small-button ::ng-deep {
+    width: 20px;
+    height: 20px;
+
+    line-height: inherit;
+
+    mat-icon {
+        font-size: 100%;
+    }
+}

client/src/app/site/motions/components/manage-submitters/manage-submitters.component.spec.ts

@@ -0,0 +1,41 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ManageSubmittersComponent } from './manage-submitters.component';
+import { E2EImportsModule } from 'e2e-imports.module';
+import { ViewChild, Component } from '@angular/core';
+import { ViewMotion } from '../../models/view-motion';
+
+describe('ManageSubmittersComponent', () => {
+
+    @Component({
+        selector: 'os-host-component',
+        template: '<os-manage-submitters></os-manage-submitters>'
+    })
+    class TestHostComponent {
+        @ViewChild(ManageSubmittersComponent)
+        public manageSubmitterComponent: ManageSubmittersComponent;
+    }
+
+    let hostComponent: TestHostComponent;
+    let hostFixture: ComponentFixture<TestHostComponent>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [E2EImportsModule],
+            declarations: [ManageSubmittersComponent, TestHostComponent]
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        hostFixture = TestBed.createComponent(TestHostComponent);
+        hostComponent = hostFixture.componentInstance;
+    });
+
+    it('should create', () => {
+        const motion = new ViewMotion();
+        hostComponent.manageSubmitterComponent.motion = motion;
+
+        hostFixture.detectChanges();
+        expect(hostComponent.manageSubmitterComponent).toBeTruthy();
+    });
+});

client/src/app/site/motions/components/manage-submitters/manage-submitters.component.ts

@@ -0,0 +1,150 @@
+import { Component, Input } from '@angular/core';
+import { FormGroup, FormControl } from '@angular/forms';
+import { Title } from '@angular/platform-browser';
+import { TranslateService } from '@ngx-translate/core';
+import { MatSnackBar } from '@angular/material';
+
+import { BehaviorSubject, Observable } from 'rxjs';
+
+import { ViewMotion } from '../../models/view-motion';
+import { User } from 'app/shared/models/users/user';
+import { DataStoreService } from 'app/core/services/data-store.service';
+import { MotionRepositoryService } from '../../services/motion-repository.service';
+import { BaseViewComponent } from 'app/site/base/base-view';
+
+/**
+ * Component for the motion comments view
+ */
+@Component({
+    selector: 'os-manage-submitters',
+    templateUrl: './manage-submitters.component.html',
+    styleUrls: ['./manage-submitters.component.scss']
+})
+export class ManageSubmittersComponent extends BaseViewComponent {
+    /**
+     * The motion, which the personal note belong to.
+     */
+    @Input()
+    public motion: ViewMotion;
+
+    /**
+     * Keep all users to display them.
+     */
+    public users: BehaviorSubject<User[]>;
+
+    /**
+     * The form to add new submitters
+     */
+    public addSubmitterForm: FormGroup;
+
+    /**
+     * The current list of submitters.
+     */
+    public readonly editSubmitterSubject: BehaviorSubject<User[]> = new BehaviorSubject([]);
+
+    /**
+     * The observable from editSubmitterSubject. Fixing this value is a performance boost, because
+     * it is just set one time at loading instead of calling .asObservable() every time.
+     */
+    public editSubmitterObservable: Observable<User[]>;
+
+    /**
+     * Saves, if the users edits the note.
+     */
+    public isEditMode = false;
+
+    /**
+     * Sets up the form and observables.
+     *
+     * @param title
+     * @param translate
+     * @param matSnackBar
+     * @param DS
+     * @param repo
+     */
+    public constructor(
+        title: Title,
+        translate: TranslateService,
+        matSnackBar: MatSnackBar,
+        private DS: DataStoreService,
+        private repo: MotionRepositoryService
+    ) {
+        super(title, translate, matSnackBar);
+
+        this.addSubmitterForm = new FormGroup({ userId: new FormControl([]) });
+        this.editSubmitterObservable = this.editSubmitterSubject.asObservable();
+
+        // get all users for the submitter add form
+        this.users = new BehaviorSubject(this.DS.getAll(User));
+        this.DS.changeObservable.subscribe(model => {
+            if (model instanceof User) {
+                this.users.next(this.DS.getAll(User));
+            }
+        });
+
+        // detect changes in the form
+        this.addSubmitterForm.valueChanges.subscribe(formResult => {
+            if (formResult && formResult.userId) {
+                this.addNewSubmitter(formResult.userId);
+            }
+        });
+    }
+
+    /**
+     * Enter the edit mode and reset the form and the submitters.
+     */
+    public onEdit(): void {
+        this.isEditMode = true;
+        this.editSubmitterSubject.next(this.motion.submitters.map(x => x));
+        this.addSubmitterForm.reset();
+    }
+
+    /**
+     * Save the submitters
+     */
+    public onSave(): void {
+        this.repo
+            .setSubmitters(this.motion, this.editSubmitterSubject.getValue())
+            .then(() => (this.isEditMode = false), this.raiseError);
+    }
+
+    /**
+     * Close the edit view.
+     */
+    public onCancel(): void {
+        this.isEditMode = false;
+    }
+
+    /**
+     * Adds the user to the submitters, if he isn't already in there.
+     *
+     * @param userId The user to add
+     */
+    public addNewSubmitter(userId: number): void {
+        const submitters = this.editSubmitterSubject.getValue();
+        if (!submitters.map(u => u.id).includes(userId)) {
+            submitters.push(this.DS.get(User, userId));
+            this.editSubmitterSubject.next(submitters);
+        }
+        this.addSubmitterForm.reset();
+    }
+
+    /**
+     * A sort event occures. Saves the new order into the editSubmitterSubject.
+     *
+     * @param users The new, sorted users.
+     */
+    public onSortingChange(users: User[]): void {
+        this.editSubmitterSubject.next(users);
+    }
+
+    /**
+     * Removes the user from the list of submitters.
+     *
+     * @param user The user to remove as a submitters
+     */
+    public onRemove(user: User): void {
+        const submitters = this.editSubmitterSubject.getValue();
+        this.editSubmitterSubject.next(submitters.filter(u => u.id !== user.id));
+    }
+}

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

@@ -183,10 +183,7 @@
                 </div>
             </div>
             <div *ngIf="!editMotion && !newMotion">
-                <h4 translate>Submitters</h4>
+                <os-manage-submitters [motion]="motion"></os-manage-submitters>
-                <mat-chip-list *ngFor="let submitter of motion.submitters">
-                    <mat-chip>{{ submitter.full_name }}</mat-chip>
-                </mat-chip-list>
             </div>
         </div>
 

client/src/app/site/motions/motions.module.ts

@@ -18,6 +18,7 @@ import { CallListComponent } from './components/call-list/call-list.component';
 import { AmendmentCreateWizardComponent } from './components/amendment-create-wizard/amendment-create-wizard.component';
 import { MotionBlockListComponent } from './components/motion-block-list/motion-block-list.component';
 import { MotionBlockDetailComponent } from './components/motion-block-detail/motion-block-detail.component';
+import { ManageSubmittersComponent } from './components/manage-submitters/manage-submitters.component';
 
 @NgModule({
     imports: [CommonModule, MotionsRoutingModule, SharedModule],
@@ -36,7 +37,8 @@ import { MotionBlockDetailComponent } from './components/motion-block-detail/mot
         CallListComponent,
         AmendmentCreateWizardComponent,
         MotionBlockListComponent,
-        MotionBlockDetailComponent
+        MotionBlockDetailComponent,
+        ManageSubmittersComponent
     ],
     entryComponents: [
         MotionChangeRecommendationComponent,
@@ -44,7 +46,8 @@ import { MotionBlockDetailComponent } from './components/motion-block-detail/mot
         MotionCommentsComponent,
         MotionCommentSectionListComponent,
         MetaTextBlockComponent,
-        PersonalNoteComponent
+        PersonalNoteComponent,
+        ManageSubmittersComponent
     ]
 })
 export class MotionsModule {}

client/src/app/site/motions/services/motion-repository.service.ts

@@ -192,6 +192,22 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
         await this.update(motion, viewMotion);
     }
 
+    /**
+     * Sets the submitters by sending a request to the server,
+     *
+     * @param viewMotion The motion to change the submitters from
+     * @param submitters The submitters to set
+     */
+    public async setSubmitters(viewMotion: ViewMotion, submitters: User[]): Promise<void> {
+        const requestData = {
+            motions: [{
+                id: viewMotion.id,
+                submitters: submitters.map(s => s.id),
+            }]
+        };
+        this.httpService.post('/rest/motions/motion/manage_multiple_submitters/', requestData);
+    }
+
     /**
      * Sends the changed nodes to the server.
      *

openslides/motions/views.py

@@ -15,7 +15,6 @@ from ..core.config import config
 from ..core.models import Tag
 from ..utils.auth import has_perm, in_some_groups
 from ..utils.autoupdate import inform_changed_data, inform_deleted_data
-from ..utils.exceptions import OpenSlidesError
 from ..utils.rest_api import (
     CreateModelMixin,
     DestroyModelMixin,
@@ -81,8 +80,7 @@ class MotionViewSet(ModelViewSet):
                       (not config['motions_stop_submitting'] or
                        has_perm(self.request.user, 'motions.can_manage')))
         elif self.action in ('set_state', 'set_recommendation', 'manage_multiple_recommendation',
-                             'follow_recommendation', 'manage_submitters',
+                             'follow_recommendation', 'manage_multiple_submitters',
-                             'sort_submitters', 'manage_multiple_submitters',
                              'manage_multiple_tags', 'create_poll'):
             result = (has_perm(self.request.user, 'motions.can_see') and
                       has_perm(self.request.user, 'motions.can_manage_metadata'))
@@ -392,106 +390,6 @@ class MotionViewSet(ModelViewSet):
 
         return Response({'detail': message})
 
-    @detail_route(methods=['POST', 'DELETE'])
-    def manage_submitters(self, request, pk=None):
-        """
-        POST: Add a user as a submitter to this motion.
-        DELETE: Remove the user as a submitter from this motion.
-        For both cases provide ['user': <user_id>} for the user to add or remove.
-        """
-        motion = self.get_object()
-
-        if request.method == 'POST':
-            user_id = request.data.get('user')
-
-            # Check permissions and other conditions. Get user instance.
-            if user_id is None:
-                raise ValidationError({'detail': _('You have to provide a user.')})
-            else:
-                try:
-                    user = get_user_model().objects.get(pk=int(user_id))
-                except (ValueError, get_user_model().DoesNotExist):
-                    raise ValidationError({'detail': _('User does not exist.')})
-
-            # Try to add the user. This ensurse that a user is not twice a submitter
-            try:
-                Submitter.objects.add(user, motion)
-            except OpenSlidesError as e:
-                raise ValidationError({'detail': str(e)})
-            message = _('User %s was successfully added as a submitter.') % user
-
-            # Send new submitter via autoupdate because users without permission
-            # to see users may not have it but can get it now.
-            inform_changed_data(user)
-
-        else:  # DELETE
-            user_id = request.data.get('user')
-
-            # Check permissions and other conditions. Get user instance.
-            if user_id is None:
-                raise ValidationError({'detail': _('You have to provide a user.')})
-            else:
-                try:
-                    user = get_user_model().objects.get(pk=int(user_id))
-                except (ValueError, get_user_model().DoesNotExist):
-                    raise ValidationError({'detail': _('User does not exist.')})
-
-                queryset = Submitter.objects.filter(motion=motion, user=user)
-                try:
-                    # We assume that there aren't multiple entries because this
-                    # is forbidden by the Manager's add method. We assume that
-                    # there is only one submitter instance or none.
-                    submitter = queryset.get()
-                except Submitter.DoesNotExist:
-                    raise ValidationError({'detail': _('The user is not a submitter.')})
-                else:
-                    name = str(submitter.user)
-                    submitter.delete()
-                    message = _('User {} successfully removed as a submitter.').format(name)
-
-        # Initiate response.
-        return Response({'detail': message})
-
-    @detail_route(methods=['POST'])
-    def sort_submitters(self, request, pk=None):
-        """
-        Special view endpoint to sort the submitters.
-        Send {'submitters': [<submitter_id_1>, <submitter_id_2>, ...]} as payload.
-        """
-        # Retrieve motion.
-        motion = self.get_object()
-
-        # Check data
-        submitter_ids = request.data.get('submitters')
-        if not isinstance(submitter_ids, list):
-            raise ValidationError(
-                {'detail': _('Invalid data.')})
-
-        # Get all submitters
-        submitters = {}
-        for submitter in motion.submitters.all():
-            submitters[submitter.pk] = submitter
-
-        # Check and sort submitters
-        valid_submitters = []
-        for submitter_id in submitter_ids:
-            if not isinstance(submitter_id, int) or submitters.get(submitter_id) is None:
-                raise ValidationError(
-                    {'detail': _('Invalid data.')})
-            valid_submitters.append(submitters[submitter_id])
-        weight = 1
-        with transaction.atomic():
-            for submitter in valid_submitters:
-                submitter.weight = weight
-                submitter.save(skip_autoupdate=True)
-                weight += 1
-
-        # send autoupdate
-        inform_changed_data(motion)
-
-        # Initiate response.
-        return Response({'detail': _('Submitters successfully sorted.')})
-
     @list_route(methods=['post'])
     @transaction.atomic
     def manage_multiple_submitters(self, request):

tests/integration/motions/test_viewset.py

@@ -615,7 +615,7 @@ class DeleteMotion(TestCase):
         self.assertEqual(motions, 0)
 
 
-class ManageSubmitters(TestCase):
+class ManageMultipleSubmitters(TestCase):
     """
     Tests adding and removing of submitters.
     """
@@ -624,47 +624,66 @@ class ManageSubmitters(TestCase):
         self.client.login(username='admin', password='admin')
 
         self.admin = get_user_model().objects.get()
-        self.motion = Motion(
+        self.motion1 = Motion(
             title='test_title_SlqfMw(waso0saWMPqcZ',
             text='test_text_f30skclqS9wWF=xdfaSL')
-        self.motion.save()
+        self.motion1.save()
+        self.motion2 = Motion(
+            title='test_title_f>FLEim38MC2m9PFp2jG',
+            text='test_text_kg39KFGm,ao)22FK9lLu')
+        self.motion2.save()
 
-    def test_add_existing_user(self):
+    @pytest.mark.skip(reason="This throws an json validation error I'm not sure about")
+    def test_set_submitters(self):
         response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
+            reverse('motion-manage-multiple-submitters'),
-            {'user': self.admin.pk})
+            {
+                'motions': [
+                    {
+                        'id': self.motion1.id,
+                        'submitters': [
+                            self.admin.pk
+                        ]
+                    },
+                    {
+                        'id': self.motion2.id,
+                        'submitters': [
+                            self.admin.pk
+                        ]
+                    }
+                ]
+            })
+        print(response.data['detail'])
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(self.motion.submitters.count(), 1)
+        self.assertEqual(self.motion1.submitters.count(), 1)
+        self.assertEqual(self.motion2.submitters.count(), 1)
+        self.assertEqual(
+            self.motion1.submitters.get().pk,
+            self.motion2.submitters.get().pk)
 
-    def test_add_non_existing_user(self):
+    def test_non_existing_user(self):
         response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
+            reverse('motion-manage-multiple-submitters'),
-            {'user': 1337})
+            {'motions': [
+                {'id': self.motion1.id,
+                 'submitters': [1337]}]})
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
+        self.assertEqual(self.motion1.submitters.count(), 0)
-
-    def test_add_user_twice(self):
-        response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 1)
 
     def test_add_user_no_data(self):
         response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]))
+            reverse('motion-manage-multiple-submitters'))
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
+        self.assertEqual(self.motion1.submitters.count(), 0)
+        self.assertEqual(self.motion2.submitters.count(), 0)
 
     def test_add_user_invalid_data(self):
         response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
+            reverse('motion-manage-multiple-submitters'),
-            {'user': ['invalid_str']})
+            {'motions': ['invalid_str']})
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
+        self.assertEqual(self.motion1.submitters.count(), 0)
+        self.assertEqual(self.motion2.submitters.count(), 0)
 
     def test_add_without_permission(self):
         admin = get_user_model().objects.get(username='admin')
@@ -673,56 +692,13 @@ class ManageSubmitters(TestCase):
         inform_changed_data(admin)
 
         response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
+            reverse('motion-manage-multiple-submitters'),
-            {'user': self.admin.pk})
+            {'motions': [
+                {'id': self.motion1.id,
+                 'submitters': [self.admin.pk]}]})
         self.assertEqual(response.status_code, 403)
-        self.assertEqual(self.motion.submitters.count(), 0)
+        self.assertEqual(self.motion1.submitters.count(), 0)
-
+        self.assertEqual(self.motion2.submitters.count(), 0)
-    def test_remove_existing_user(self):
-        response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(self.motion.submitters.count(), 0)
-
-    def test_remove_non_existing_user(self):
-        response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': 1337})
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 1)
-
-    def test_remove_existing_user_twice(self):
-        response = self.client.post(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': self.admin.pk})
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
-
-    def test_remove_user_no_data(self):
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]))
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
-
-    def test_remove_user_invalid_data(self):
-        response = self.client.delete(
-            reverse('motion-manage-submitters', args=[self.motion.pk]),
-            {'user': ['invalid_str']})
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(self.motion.submitters.count(), 0)
 
 
 class ManageComments(TestCase):