Merge branch 'master' into 40_45_82_update_roles

web/frontend/src/joblist/JobInfo.svelte

@@ -60,7 +60,12 @@
     </p>
 
     <p>
-        {job.numNodes} <Icon name="pc-horizontal"/>
+        {#if job.numNodes == 1}
+            {job.resources[0].hostname}
+        {:else}
+            {job.numNodes}
+        {/if}
+        <Icon name="pc-horizontal"/>
         {#if job.exclusive != 1}
             (shared)
         {/if}
@@ -70,6 +75,8 @@
         {#if job.numHWThreads > 0}
             , {job.numHWThreads} <Icon name="cpu"/>
         {/if}
+        <br/>
+        {job.subCluster}
     </p>
 
     <p>

web/frontend/src/joblist/JobList.svelte

@@ -34,7 +34,7 @@
         jobs(filter: $filter, order: $sorting, page: $paging) {
             items {
                 id, jobId, user, project, jobName, cluster, subCluster, startTime,
-                duration, numNodes, numHWThreads, numAcc, walltime,
+                duration, numNodes, numHWThreads, numAcc, walltime, resources { hostname },
                 SMT, exclusive, partition, arrayJobId,
                 monitoringStatus, state,
                 tags { id, type, name }