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

Jump to bottom

update all the place to show user name instead of ID #5215

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update all the place to show user name instead of ID #5215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac94712
Update setting.html change user display name from ID to name
kalavt Aug 29, 2024
d21a03c
Update system-role-manage.html set. user display name from ID to name
kalavt Aug 29, 2024
88571d0
Update PermissionController.java to return user information with name
kalavt Aug 29, 2024
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
5 changes: 2 additions & 3 deletions ...rtal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,8 @@ public ResponseEntity<Void> deleteCreateApplicationRoleFromUser(@PathVariable("u

@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@GetMapping("/system/role/createApplication")
public List<String> getCreateApplicationRoleUsers() {
return rolePermissionService.queryUsersWithRole(SystemRoleManagerService.CREATE_APPLICATION_ROLE_NAME)
.stream().map(UserInfo::getUserId).collect(Collectors.toList());
public Set<UserInfo> getCreateApplicationRoleUsers() {
return rolePermissionService.queryUsersWithRole(SystemRoleManagerService.CREATE_APPLICATION_ROLE_NAME);
}

@GetMapping("/system/role/createApplication/{userId}")
Expand Down
4 changes: 2 additions & 2 deletions apollo-portal/src/main/resources/static/app/setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h5>{{'App.Setting.Admin' | translate }}
<div class="item-container">

<div class="btn-group item-info" ng-repeat="user in appRoleUsers.masterUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default" ng-bind="user.name"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
ng-click="removeMasterRoleFromUser(user.userId)">
Expand Down Expand Up @@ -220,4 +220,4 @@ <h4 translate="App.Setting.NoPermissionTips" translate-value-users="{{admins.joi
<script type="application/javascript" src="../scripts/controller/SettingController.js"></script>
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions apollo-portal/src/main/resources/static/system-role-manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ <h5>{{'SystemRole.AddCreateAppRoleToUser' | translate }}
<h5>{{'SystemRole.AuthorizedUser' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in hasCreateApplicationPermissionUserList">
<button type="button" class="btn btn-default" ng-bind="user"></button>
<button type="button" class="btn btn-default" ng-bind="user.name"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="deleteCreateApplicationRoleFromUser(user)">
ng-click="deleteCreateApplicationRoleFromUser(user.userId)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
Expand Down
Loading