diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 0421eabda..d2e1b7cfa 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -161,6 +161,7 @@ angular.module('OpenSlidesApp.agenda.site', [ displayName: gettext('Internal items'), choiceYes: gettext('Internal items'), choiceNo: gettext('No internal items'), + permission: 'agenda.can_see_hidden_items', }, }; } diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index d1b675acb..28df6571b 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -155,7 +155,8 @@ Filter - + @@ -321,11 +322,6 @@ {{ item.comment }} -
- - {{ item.comment }} - -
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 4ffdb19ed..0ead12237 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -1206,6 +1206,7 @@ angular.module('OpenSlidesApp.users.site', [ .controller('GroupListCtrl', [ '$scope', '$http', + '$filter', 'operator', 'Group', 'permissions', @@ -1217,14 +1218,14 @@ angular.module('OpenSlidesApp.users.site', [ 'User', 'ngDialog', 'OpenSlidesPlugins', - function($scope, $http, operator, Group, permissions, gettext, Agenda, Assignment, Mediafile, - Motion, User, ngDialog, OpenSlidesPlugins) { + function($scope, $http, $filter, operator, Group, permissions, gettext, Agenda, + Assignment, Mediafile, Motion, User, ngDialog, OpenSlidesPlugins) { $scope.permissions = permissions; $scope.$watch(function() { return Group.lastModified(); }, function() { - $scope.groups = Group.getAll(); + $scope.groups = $filter('orderBy')(Group.getAll(), 'id'); // find all groups with the 2 dangerous permissions var groups_danger = [];