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

Merge pull request #3193 from emanuelschuetze/sortLastSpeakers

Browse Source 
Fixed sorting of last speakers.
This commit is contained in:
Emanuel Schütze 2017-04-11 17:06:25 +02:00 committed by GitHub
commit 152585a73f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -7,13 +7,17 @@ https://openslides.org/
Version 2.2 (unreleased) Version 2.2 (unreleased)
========================== ==========================
Motions: Agenda:
- New export dialog. - Fixed wrong sorting of last speakers [#3193].
- Fixed issue when creating/deleting motion comment fields in the settings.
Motions:
- New export dialog [#3185].
- Fixed issue when creating/deleting motion comment fields in the
settings [#3187].
Core: Core:
- No reload on logoff. OpenSlides is now a full single page application. - No reload on logoff. OpenSlides is now a full single page
application [#3172].
Version 2.1.1 (2017-04-05) Version 2.1.1 (2017-04-05)

2
openslides/agenda/static/js/agenda/site.js
View File

@ -412,6 +412,7 @@ angular.module('OpenSlidesApp.agenda.site', [
$scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null}); $scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
// last speakers // last speakers
$scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'}); $scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
$scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
}); });
$scope.$watch(function () { $scope.$watch(function () {
return Projector.lastModified(); return Projector.lastModified();
@ -665,6 +666,7 @@ angular.module('OpenSlidesApp.agenda.site', [
$scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null}); $scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
// last speakers // last speakers
$scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'}); $scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
$scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
} else { } else {
$scope.speakers = void 0; $scope.speakers = void 0;
$scope.nextSpeakers = void 0; $scope.nextSpeakers = void 0;