Skip to content

Commit 1f9822a

Browse files
committed
Fixes in admin panel
1 parent 3c74742 commit 1f9822a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/java/eu/openanalytics/shinyproxy/controllers/AdminController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public class AdminController extends BaseController {
5858
@RequestMapping("/admin")
5959
private String admin(ModelMap map, HttpServletRequest request) {
6060
prepareMap(map, request);
61+
map.put("page", "admin");
6162

6263
return "admin";
6364
}
@@ -152,7 +153,7 @@ public ProxyInfo(Proxy proxy) {
152153
backendContainerName = "N/A";
153154
}
154155

155-
if (proxy.getTargets().containsKey(proxy.getId())) {
156+
if (proxy.getTargets().containsKey("")) {
156157
endpoint = proxy.getTargets().get("").toString();
157158
} else {
158159
endpoint = "N/A";

src/main/resources/templates/fragments/modal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h4 class="modal-title">App Details</h4>
8787
<div class="modal-body">
8888
<div id="appDetails">
8989
</div>
90-
<form class="form-inline" id="changeUserIdForm" th:if="${allowTransferApp}">
90+
<form class="form-inline" id="changeUserIdForm" th:if="${allowTransferApp && page != 'admin'}">
9191
<div class="form-group">
9292
<label for="userIdField"><span class="glyphicon glyphicon-chat"></span>Transfer app to another user:</label><br>
9393
<div class="input-group">

0 commit comments

Comments
 (0)