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

Fixed outdated assignment phases variable in projetor.js.

Browse Source 
Removed wrong translation string.
This commit is contained in:
Emanuel Schütze 2017-02-10 23:25:42 +01:00
parent da61aac89a
commit 41b30d70b6
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/assignments/static/js/assignments/base.js
View File

@ -324,7 +324,6 @@ angular.module('OpenSlidesApp.assignments', [])
'gettext', 'gettext',
function ($http, DS, Projector, AssignmentRelatedUser, AssignmentPoll, jsDataModel, gettext) { function ($http, DS, Projector, AssignmentRelatedUser, AssignmentPoll, jsDataModel, gettext) {
var name = 'assignments/assignment'; var name = 'assignments/assignment';
var phases;
return DS.defineResource({ return DS.defineResource({
name: name, name: name,
useClass: jsDataModel, useClass: jsDataModel,

7
openslides/assignments/static/js/assignments/projector.js
View File

@ -16,8 +16,9 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment
.controller('SlideAssignmentCtrl', [ .controller('SlideAssignmentCtrl', [
'$scope', '$scope',
'Assignment', 'Assignment',
'AssignmentPhases',
'User', 'User',
function($scope, Assignment, User) { function($scope, Assignment, AssignmentPhases, User) {
// Attention! Each object that is used here has to be dealt on server side. // 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 // Add it to the coresponding get_requirements method of the ProjectorElement
// class. // class.
@ -25,9 +26,7 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment
$scope.showResult = $scope.element.poll; $scope.showResult = $scope.element.poll;
Assignment.bindOne(id, $scope, 'assignment'); Assignment.bindOne(id, $scope, 'assignment');
Assignment.getPhases().then(function(phases) { $scope.phases = AssignmentPhases;
$scope.phases = phases;
});
User.bindAll({}, $scope, 'users'); User.bindAll({}, $scope, 'users');
} }
]); ]);

1
openslides/core/static/templates/core/projector-controls.html
View File

@ -274,7 +274,6 @@
uib-tooltip="{{ 'Project the current list of speakers' | translate }}" uib-tooltip="{{ 'Project the current list of speakers' | translate }}"
os-perms="core.can_manage_projector"> os-perms="core.can_manage_projector">
<button type="button" class="btn btn-default btn-sm" <button type="button" class="btn btn-default btn-sm"
title="{{ 'Project current list of speakers' | translate }}"
ng-click="currentListOfSpeakers.project(listOfSpeakersDefaultProjectorId, currentListOfSpeakersAsOverlay)" ng-click="currentListOfSpeakers.project(listOfSpeakersDefaultProjectorId, currentListOfSpeakersAsOverlay)"
ng-class="{ 'btn-primary': currentListOfSpeakers.isProjected().length && inArray(currentListOfSpeakers.isProjected(), listOfSpeakersDefaultProjectorId)}"> ng-class="{ 'btn-primary': currentListOfSpeakers.isProjected().length && inArray(currentListOfSpeakers.isProjected(), listOfSpeakersDefaultProjectorId)}">
<i class="fa fa-video-camera"></i> <i class="fa fa-video-camera"></i>