Merge pull request #3193 from emanuelschuetze/sortLastSpeakers
Fixed sorting of last speakers.
This commit is contained in:
commit
152585a73f
12
CHANGELOG
12
CHANGELOG
@ -7,13 +7,17 @@ https://openslides.org/
|
||||
Version 2.2 (unreleased)
|
||||
==========================
|
||||
|
||||
Motions:
|
||||
- New export dialog.
|
||||
- Fixed issue when creating/deleting motion comment fields in the settings.
|
||||
Agenda:
|
||||
- Fixed wrong sorting of last speakers [#3193].
|
||||
|
||||
Motions:
|
||||
- New export dialog [#3185].
|
||||
- Fixed issue when creating/deleting motion comment fields in the
|
||||
settings [#3187].
|
||||
|
||||
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)
|
||||
|
@ -412,6 +412,7 @@ angular.module('OpenSlidesApp.agenda.site', [
|
||||
$scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
|
||||
// last speakers
|
||||
$scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
|
||||
$scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
|
||||
});
|
||||
$scope.$watch(function () {
|
||||
return Projector.lastModified();
|
||||
@ -665,6 +666,7 @@ angular.module('OpenSlidesApp.agenda.site', [
|
||||
$scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
|
||||
// last speakers
|
||||
$scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
|
||||
$scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
|
||||
} else {
|
||||
$scope.speakers = void 0;
|
||||
$scope.nextSpeakers = void 0;
|
||||
|
Loading…
Reference in New Issue
Block a user