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

Merge pull request #2847 from FinnStutzenstein/Issue2844

Browse Source 
Group order and hide internal items filter
This commit is contained in:
Emanuel Schütze 2017-01-14 11:39:51 +01:00 committed by GitHub
commit 8c4b38f018
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,7 @@ angular.module('OpenSlidesApp.agenda.site', [
displayName: gettext('Internal items'), displayName: gettext('Internal items'),
choiceYes: gettext('Internal items'), choiceYes: gettext('Internal items'),
choiceNo: gettext('No internal items'), choiceNo: gettext('No internal items'),
permission: 'agenda.can_see_hidden_items',
}, },
}; };
} }

8
openslides/agenda/static/templates/agenda/item-list.html
View File

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

7
openslides/users/static/js/users/site.js
View File

@ -1206,6 +1206,7 @@ angular.module('OpenSlidesApp.users.site', [
.controller('GroupListCtrl', [ .controller('GroupListCtrl', [
'$scope', '$scope',
'$http', '$http',
'$filter',
'operator', 'operator',
'Group', 'Group',
'permissions', 'permissions',
@ -1217,14 +1218,14 @@ angular.module('OpenSlidesApp.users.site', [
'User', 'User',
'ngDialog', 'ngDialog',
'OpenSlidesPlugins', 'OpenSlidesPlugins',
function($scope, $http, operator, Group, permissions, gettext, Agenda, Assignment, Mediafile, function($scope, $http, $filter, operator, Group, permissions, gettext, Agenda,
Motion, User, ngDialog, OpenSlidesPlugins) { Assignment, Mediafile, Motion, User, ngDialog, OpenSlidesPlugins) {
$scope.permissions = permissions; $scope.permissions = permissions;
$scope.$watch(function() { $scope.$watch(function() {
return Group.lastModified(); return Group.lastModified();
}, function() { }, function() {
$scope.groups = Group.getAll(); $scope.groups = $filter('orderBy')(Group.getAll(), 'id');
// find all groups with the 2 dangerous permissions // find all groups with the 2 dangerous permissions
var groups_danger = []; var groups_danger = [];