Skip to content

Commit

Permalink
User admin search user byName support search by loginName and userName
Browse files Browse the repository at this point in the history
clear keywords when switch search user by role
  • Loading branch information
yzhang921 committed May 31, 2017
1 parent 3c10c43 commit 5e8ef76
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/webapp/org/cboard/view/admin/user.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="row" style="margin-bottom: 10px">
<div class="col-md-12">
<div class="input-group">
<span class="input-group-addon" style="cursor:pointer" ng-click="filterByRole=!filterByRole">{{filterByRole?'ADMIN.BY_ROLE':'ADMIN.BY_NAME'|translate}}</span>
<span class="input-group-addon" style="cursor:pointer" ng-click="filterByRole=!filterByRole;userKeyword=''">{{filterByRole?'ADMIN.BY_ROLE':'ADMIN.BY_NAME'|translate}}</span>
<input ng-show="!filterByRole" type="text" class="form-control" ng-model="userKeyword">
<ui-select ng-show="filterByRole" ng-model="selectedRoleFilter" on-select="onRoleFilter($item)">
<ui-select-match>
Expand Down

0 comments on commit 5e8ef76

Please sign in to comment.