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

Merge pull request #3655 from emanuelschuetze/groupSorting

Browse Source 
Fix group filtering in users list view
This commit is contained in:
Emanuel Schütze 2018-03-15 14:17:38 +01:00 committed by GitHub
commit 09e74481cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/users/static/templates/users/user-list.html
View File

@ -97,7 +97,7 @@
<select ng-show="selectedAction == 'addGroup' || selectedAction == 'removeGroup'" <select ng-show="selectedAction == 'addGroup' || selectedAction == 'removeGroup'"
ng-model="selectedGroup" class="form-control input-sm"> ng-model="selectedGroup" class="form-control input-sm">
<option value="" translate>--- Select group ---</option> <option value="" translate>--- Select group ---</option>
<option ng-repeat="group in groups" value="{{ group.id }}">{{ group.name | translate }}</option> <option ng-repeat="group in groups | orderBy: 'id'" value="{{ group.id }}">{{ group.name | translate }}</option>
</select> </select>
<!-- add group button --> <!-- add group button -->
<a ng-show="selectedAction == 'addGroup'" <a ng-show="selectedAction == 'addGroup'"
@ -198,7 +198,7 @@
<span class="caret"></span> <span class="caret"></span>
</span> </span>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownGroup"> <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownGroup">
<li ng-repeat="group in groups"> <li ng-repeat="group in groups | orderBy: 'id'">
<a href ng-click="filter.operateMultiselectFilter('group', group.id, isSelectMode)"> <a href ng-click="filter.operateMultiselectFilter('group', group.id, isSelectMode)">
<i class="fa fa-check" ng-if="filter.multiselectFilters.group.indexOf(group.id) > -1"></i> <i class="fa fa-check" ng-if="filter.multiselectFilters.group.indexOf(group.id) > -1"></i>
{{ group.name | translate }} {{ group.name | translate }}
@ -270,7 +270,7 @@
</span> </span>
<!-- show all selected multiselectoptions --> <!-- show all selected multiselectoptions -->
<span> <span>
<span ng-repeat="group in groups" class="pointer spacer-left-lg" <span ng-repeat="group in groups | orderBy: 'id'" class="pointer spacer-left-lg"
ng-if="filter.multiselectFilters.group.indexOf(group.id) > -1" ng-if="filter.multiselectFilters.group.indexOf(group.id) > -1"
ng-click="filter.operateMultiselectFilter('group', group.id, isSelectMode)" ng-click="filter.operateMultiselectFilter('group', group.id, isSelectMode)"
ng-class="{'disabled': isSelectMode}"> ng-class="{'disabled': isSelectMode}">
@ -369,13 +369,13 @@
<span ng-if="user.groups_id.length"> <span ng-if="user.groups_id.length">
<i class="fa fa-users"></i> <i class="fa fa-users"></i>
<span ng-repeat="group in user.groups_id | limitTo:2"> <span ng-repeat="group in user.groups_id | limitTo:2">
{{ (groups | filter: {id: group})[0].name | translate }}<span ng-if="!$last">,</span></span><span ng-if="user.groups_id.length > 2">, {{ (groups | filter: {id: group}:true)[0].name | translate }}<span ng-if="!$last">,</span></span><span ng-if="user.groups_id.length > 2">,
... [+{{ user.groups_id.length - 2}}]</span> ... [+{{ user.groups_id.length - 2}}]</span>
<i class="fa fa-cog fa-lg spcaer-left" ng-show="user.groupHover"></i> <i class="fa fa-cog fa-lg spcaer-left" ng-show="user.groupHover"></i>
</span> </span>
</span> </span>
<ul class="dropdown-menu" aria-labelledby="dropdown-group{{ user.id }}"> <ul class="dropdown-menu" aria-labelledby="dropdown-group{{ user.id }}">
<li ng-repeat="group in groups"> <li ng-repeat="group in groups | orderBy: 'id'">
<a href ng-click="toggleGroup(user, group)"> <a href ng-click="toggleGroup(user, group)">
<i class="fa fa-check" ng-if="inArray(user.groups_id, group.id)"></i> <i class="fa fa-check" ng-if="inArray(user.groups_id, group.id)"></i>
{{ group.name | translate }} {{ group.name | translate }}