From f092d6670d4bc8eaf54f96a7c94d6242dcac7b35 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@rats-os.de>
Date: Sat, 14 Jan 2017 10:19:23 +0100
Subject: [PATCH] Group order, hide internal items filter, hide comment in
 agenda list view

---
 openslides/agenda/static/js/agenda/site.js               | 1 +
 openslides/agenda/static/templates/agenda/item-list.html | 8 ++------
 openslides/users/static/js/users/site.js                 | 7 ++++---
 3 files changed, 7 insertions(+), 9 deletions(-)

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 @@
             <translate>Filter</translate>
           </span>
           <!-- boolean Filters -->
-          <span ng-repeat="(name, booleanFilter) in filter.booleanFilters" uib-dropdown>
+          <span ng-repeat="(name, booleanFilter) in filter.booleanFilters"
+            ng-if="!booleanFilter.permission || operator.hasPerms(booleanFilter.permission)" uib-dropdown>
             <span class="pointer" id="dropdown{{ name }}" uib-dropdown-toggle
               ng-class="{'bold': booleanFilter.value !== undefined, 'disabled': isSelectMode}"
               ng-disabled="isSelectMode">
@@ -321,11 +322,6 @@
                   <span ng-if="item.comment">{{ item.comment }}</span>
                 </span>
               </div>
-              <div os-perms="!agenda.can_manage">
-                <span ng-if="item.comment">
-                  <i class="fa fa-info-circle"></i> {{ item.comment }}
-                </span>
-              </div>
             </div>
           </small>
         </div>
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 = [];