Skip to content
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

Modify filter user #4562

Merged
merged 24 commits into from
Sep 9, 2022
Merged

Modify filter user #4562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4f89680
user manager 0.1
zcy1010 Jul 12, 2022
bda1dde
user manager
zcy1010 Jul 12, 2022
d4477ce
user manager
zcy1010 Jul 12, 2022
d2bdd07
Bump gson from 2.8.0 to 2.8.9
dependabot[bot] May 20, 2022
d2ff8f2
A user-friendly user management page
zcy1010 Jul 12, 2022
21c24c1
Merge branch 'apolloconfig:master' into master
zcy1010 Jul 12, 2022
e913f51
filter user
zcy1010 Jul 13, 2022
6733429
fix user edit
zcy1010 Jul 14, 2022
26477a9
delete something
zcy1010 Jul 14, 2022
a95d300
Merge branch 'master' into master
nobodyiam Jul 15, 2022
c4a9efe
fix and update userList real-time
zcy1010 Jul 18, 2022
d972b56
add a new interface to enable/disable users.
zcy1010 Jul 23, 2022
ff69437
change user type
zcy1010 Jul 23, 2022
dadcdda
format code
zcy1010 Jul 23, 2022
20b0a56
fix some logic
zcy1010 Jul 24, 2022
74c004b
fix some logic
zcy1010 Jul 25, 2022
9bc8ed1
fix some logic about create or update user
zcy1010 Jul 26, 2022
14ef972
delete tip
zcy1010 Jul 26, 2022
cd0621b
fix
zcy1010 Jul 27, 2022
a31146d
Merge branch 'master' into master
zcy1010 Aug 1, 2022
1bab738
disabled edit username
zcy1010 Aug 1, 2022
8618775
Merge branch 'apolloconfig:master' into master
zcy1010 Sep 9, 2022
7b71299
Modify Filter User button
zcy1010 Sep 9, 2022
93ad8a2
Merge branch 'master' into modifyFilterUser
nobodyiam Sep 9, 2022
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
6 changes: 0 additions & 6 deletions apollo-portal/src/main/resources/static/scripts/controller/UserController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ function UserController($scope, $window, $translate, toastr, AppUtil, UserServic
$scope.createdUsers = [];
$scope.filterUser = [];
$scope.status = '1'
$scope.showSearchUsernameInput = false
$scope.searchKey = ''
$scope.changeStatus = changeStatus
$scope.toggleUsernameSearchInput = toggleUsernameSearchInput
$scope.searchUsers = searchUsers
$scope.resetSearchUser = resetSearchUser

Expand Down Expand Up @@ -70,10 +68,6 @@ function UserController($scope, $window, $translate, toastr, AppUtil, UserServic
}
}

function toggleUsernameSearchInput() {
$scope.showSearchUsernameInput = !$scope.showSearchUsernameInput
}

function searchUsers() {
$scope.searchKey = $scope.searchKey.toLowerCase();
var filterUser = []
Expand Down
30 changes: 14 additions & 16 deletions apollo-portal/src/main/resources/static/user-manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,23 @@
class="btn btn-primary">
{{'UserMange.Add' | translate }}
</button>
<button type="button" class="btn btn-default" data-tooltip="tooltip" data-placement="bottom"
title="{{'UserMange.SortByUserLoginName' | translate }}" ng-click="toggleUsernameSearchInput()">
<span class="glyphicon glyphicon-filter"></span>
{{'UserMange.FilterUser' | translate }}
</button>
<form class="form-inline" style="display:inline">
<div class="form-group">
<input type="text" class="form-control" id="searchUserInput"
placeholder="{{'UserMange.SortByUserLoginName' | translate }}"
ng-model="searchKey">
</div>
<button type="button" class="btn btn-default" ng-click="searchUsers()">
<span class="glyphicon glyphicon-filter"></span>
{{'UserMange.FilterUser' | translate }}
</button>
<button type="button" class="btn btn-default" ng-click="resetSearchUser()">
{{'UserMange.Reset' | translate }}
</button>
</form>
</div>
<div style="height: 15px"></div>
</div>
<div class="search-input" ng-show="showSearchUsernameInput">
<form class="form-inline">
<div class="form-group">
<input type="text" class="form-control" id="searchUserInput"
placeholder="{{'UserMange.SortByUserLoginName' | translate }}"
ng-model="searchKey" ng-change="searchUsers()">
</div>
<button type="button" class="btn btn-default" ng-click="resetSearchUser()">{{'UserMange.Reset' | translate }}</button>
</form>
<div style="height: 15px"></div>
</div>
<table class="table table-bordered table-striped table-hover">
<tr>
<th style="text-align: left">{{'UserMange.UserName' | translate }}</th>
Expand Down