diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js index 31ac3d3fc..0b2fddca6 100644 --- a/openslides/assignments/static/js/assignments/base.js +++ b/openslides/assignments/static/js/assignments/base.js @@ -324,7 +324,6 @@ angular.module('OpenSlidesApp.assignments', []) 'gettext', function ($http, DS, Projector, AssignmentRelatedUser, AssignmentPoll, jsDataModel, gettext) { var name = 'assignments/assignment'; - var phases; return DS.defineResource({ name: name, useClass: jsDataModel, diff --git a/openslides/assignments/static/js/assignments/projector.js b/openslides/assignments/static/js/assignments/projector.js index 2be4c2749..0e25e8155 100644 --- a/openslides/assignments/static/js/assignments/projector.js +++ b/openslides/assignments/static/js/assignments/projector.js @@ -16,8 +16,9 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment .controller('SlideAssignmentCtrl', [ '$scope', 'Assignment', + 'AssignmentPhases', 'User', - function($scope, Assignment, User) { + function($scope, Assignment, AssignmentPhases, User) { // Attention! Each object that is used here has to be dealt on server side. // Add it to the coresponding get_requirements method of the ProjectorElement // class. @@ -25,9 +26,7 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment $scope.showResult = $scope.element.poll; Assignment.bindOne(id, $scope, 'assignment'); - Assignment.getPhases().then(function(phases) { - $scope.phases = phases; - }); + $scope.phases = AssignmentPhases; User.bindAll({}, $scope, 'users'); } ]); diff --git a/openslides/core/static/templates/core/projector-controls.html b/openslides/core/static/templates/core/projector-controls.html index 1cc82ff55..9f4fc176b 100644 --- a/openslides/core/static/templates/core/projector-controls.html +++ b/openslides/core/static/templates/core/projector-controls.html @@ -274,7 +274,6 @@ uib-tooltip="{{ 'Project the current list of speakers' | translate }}" os-perms="core.can_manage_projector">