You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2019/08/01 22:28:21 UTC
[mesos] branch master updated: Fixed the webui roles table resource
sorting.
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 682bdcd Fixed the webui roles table resource sorting.
682bdcd is described below
commit 682bdcd82202423ecd77083e28cd1aeb513edada
Author: Benjamin Mahler <bm...@apache.org>
AuthorDate: Thu Aug 1 14:56:07 2019 -0400
Fixed the webui roles table resource sorting.
All of the roles table resource columns were using the wrong
keys for sorting.
Review: https://reviews.apache.org/r/71229
---
src/webui/app/roles/roles.html | 48 +++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/webui/app/roles/roles.html b/src/webui/app/roles/roles.html
index b290587..440250a 100644
--- a/src/webui/app/roles/roles.html
+++ b/src/webui/app/roles/roles.html
@@ -51,35 +51,35 @@ Quota Limit
<th class="group-column" ng-show="show_quota_limit" colspan="4" class="end-group-column">Limit</th>
</tr>
<tr>
- <th ng-show="show_offered" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_offered" data-key="resources.gpus">GPU</th>
- <th ng-show="show_offered" data-key="resources.mem">Mem</th>
- <th ng-show="show_offered" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_offered" data-key="offered.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_offered" data-key="offered.gpus">GPU</th>
+ <th ng-show="show_offered" data-key="offered.mem">Mem</th>
+ <th ng-show="show_offered" data-key="offered.disk" class="end-group-column">Disk</th>
- <th ng-show="show_allocated" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_allocated" data-key="resources.gpus">GPU</th>
- <th ng-show="show_allocated" data-key="resources.mem">Mem</th>
- <th ng-show="show_allocated" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_allocated" data-key="allocated.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_allocated" data-key="allocated.gpus">GPU</th>
+ <th ng-show="show_allocated" data-key="allocated.mem">Mem</th>
+ <th ng-show="show_allocated" data-key="allocated.disk" class="end-group-column">Disk</th>
- <th ng-show="show_reserved" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_reserved" data-key="resources.gpus">GPU</th>
- <th ng-show="show_reserved" data-key="resources.mem">Mem</th>
- <th ng-show="show_reserved" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_reserved" data-key="reserved.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_reserved" data-key="reserved.gpus">GPU</th>
+ <th ng-show="show_reserved" data-key="reserved.mem">Mem</th>
+ <th ng-show="show_reserved" data-key="reserved.disk" class="end-group-column">Disk</th>
- <th ng-show="show_quota_consumption" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_quota_consumption" data-key="resources.gpus">GPU</th>
- <th ng-show="show_quota_consumption" data-key="resources.mem">Mem</th>
- <th ng-show="show_quota_consumption" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_quota_consumption" data-key="quota.consumed.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_quota_consumption" data-key="quota.consumed.gpus">GPU</th>
+ <th ng-show="show_quota_consumption" data-key="quota.consumed.mem">Mem</th>
+ <th ng-show="show_quota_consumption" data-key="quota.consumed.disk" class="end-group-column">Disk</th>
- <th ng-show="show_quota_guarantee" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_quota_guarantee" data-key="resources.gpus">GPU</th>
- <th ng-show="show_quota_guarantee" data-key="resources.mem">Mem</th>
- <th ng-show="show_quota_guarantee" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_quota_guarantee" data-key="quota.guarantee.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_quota_guarantee" data-key="quota.guarantee.gpus">GPU</th>
+ <th ng-show="show_quota_guarantee" data-key="quota.guarantee.mem">Mem</th>
+ <th ng-show="show_quota_guarantee" data-key="quota.guarantee.disk" class="end-group-column">Disk</th>
- <th ng-show="show_quota_limit" data-key="resources.cpus" class="begin-group-column">CPU</th>
- <th ng-show="show_quota_limit" data-key="resources.gpus">GPU</th>
- <th ng-show="show_quota_limit" data-key="resources.mem">Mem</th>
- <th ng-show="show_quota_limit" data-key="resources.disk" class="end-group-column">Disk</th>
+ <th ng-show="show_quota_limit" data-key="quota.limit.cpus" class="begin-group-column">CPU</th>
+ <th ng-show="show_quota_limit" data-key="quota.limit.gpus">GPU</th>
+ <th ng-show="show_quota_limit" data-key="quota.limit.mem">Mem</th>
+ <th ng-show="show_quota_limit" data-key="quota.limit.disk" class="end-group-column">Disk</th>
</tr>
</thead>
<tbody>