Skip to content

Implement searchbox also for grouplist #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabianlipp wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −5
Open

Implement searchbox also for grouplist #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions gruppen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,24 @@
<div class="container" ng-controller="GrouplistController as list">
<h1>Gruppen anzeigen</h1>

<form>
<div class="form-group has-feedback">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" class="form-control"
placeholder="Suchen" ng-model="list.searchText"
ng-change="list.changedSearch()" />
<span ng-if="list.searchText"
ng-click="list.searchText = ''"
class="glyphicon glyphicon-remove form-control-feedback"
style="cursor: pointer; pointer-events: all;"
uib-tooltip="clear"></span>
</div>
</div>
</form>

<div id="accordion" class="panel-group">
<div class="panel panel-default" ng-repeat="ou in list.groupData">
<div class="panel panel-default" ng-repeat="ou in list.groupData | filter: list.ouFilterPredicate(list.searchText)">
<div data-toggle="collapse" href="#collapse{{ou.ou}}"
data-parent="#accordion"
class="panel-heading clickable">
Expand All @@ -44,7 +60,7 @@ class="panel-heading clickable">
<div id="collapse{{ou.ou}}" class="panel-collapse collapse">
<ul class="list-group" ng-if="ou.groups.length">
<li class="list-group-item clickable"
ng-repeat="group in ou.groups">
ng-repeat="group in ou.groups | filter: list.searchText">
<h5 class="list-group-item-heading">
{{group.cn}}
<span class="small">
Expand All @@ -55,8 +71,8 @@ class="panel-heading clickable">
{{group.description}}
</p>
<p class="list-group-item-text small">
<a ng-if="!group.showMembers" ng-click="group.showMembers = true">Mitglieder anzeigen</a>
<a ng-if="group.showMembers" ng-click="group.showMembers = false">Mitglieder ausblenden</a>
<a ng-if="!group.showMembers" ng-click="group.showMembers = true">Mitglieder anzeigen ({{group.members.length}})</a>
<a ng-if="group.showMembers" ng-click="group.showMembers = false">Mitglieder ausblenden ({{group.members.length}})</a>
</p>
<ul ng-if="group.showMembers">
<li ng-if="!group.members.length">Keine Mitglieder in dieser Gruppe</li>
Expand Down
17 changes: 16 additions & 1 deletion js/angular-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@



useradminApp.controller('GrouplistController', function() {
useradminApp.controller('GrouplistController', function(filterFilter) {
this.groupData = JSON.parse(
document.getElementById('jsonGroupOus').textContent);
// Don't show members of any group by default
Expand All @@ -414,6 +414,21 @@
groupOu.groups[j].showMembers = false;
}
}

this.searchText = '';
this.changedSearch = function() {
let ouCount = filterFilter(this.groupData, this.searchText).length;
if (ouCount === 1) {
// Automatically open the only existing ou
$("#accordion>div>div.panel-collapse").collapse('show')
}
};
this.ouFilterPredicate = function(searchText) {
return function(ouItem) {
let filteredGroups = filterFilter(ouItem.groups, searchText);
return (filteredGroups.length > 0);
}
}
});


Expand Down