|
@@ -228,9 +228,10 @@ class CapacitySchedulerPage extends RmView {
|
|
resourcesUsed = userInfo.getResourceUsageInfo()
|
|
resourcesUsed = userInfo.getResourceUsageInfo()
|
|
.getPartitionResourceUsageInfo(nodeLabel).getUsed();
|
|
.getPartitionResourceUsageInfo(nodeLabel).getUsed();
|
|
}
|
|
}
|
|
- ResourceInfo amUsed = (resourceUsages.getAmUsed() == null)
|
|
|
|
- ? new ResourceInfo(Resources.none())
|
|
|
|
- : resourceUsages.getAmUsed();
|
|
|
|
|
|
+ ResourceInfo amUsed = userInfo.getAMResourcesUsed();
|
|
|
|
+ if (amUsed == null) {
|
|
|
|
+ amUsed = new ResourceInfo(Resources.none());
|
|
|
|
+ }
|
|
String highlightIfAsking =
|
|
String highlightIfAsking =
|
|
userInfo.getIsActive() ? ACTIVE_USER : null;
|
|
userInfo.getIsActive() ? ACTIVE_USER : null;
|
|
tbody.tr().$style(highlightIfAsking).td(userInfo.getUsername())
|
|
tbody.tr().$style(highlightIfAsking).td(userInfo.getUsername())
|