More improvements to ui

SpiNNakerManchester · Oct 20, 2023 · aeb38cb · aeb38cb
1 parent 419f2d4
commit aeb38cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/SpiNNaker-allocserv/src/main/webapp/WEB-INF/views/jobdetails.jsp b/SpiNNaker-allocserv/src/main/webapp/WEB-INF/views/jobdetails.jsp
@@ -37,7 +37,7 @@ limitations under the License.
 </tr>
 <tr>
 	<th class="lineTitle">Owner:</th>
-	<td>
+	<td id="owner">
 		<spring:eval htmlEscape="true"
 				expression="job.owner.orElse('[SHROUDED]')" />
 	</td>
@@ -67,20 +67,14 @@ limitations under the License.
 	</th>
 	<td id="keepAlive">${ job.keepAlive }</td>
 </tr>
-<tr>
-	<th class="lineTitle">Owner host:</th>
-	<td>
-		<spring:eval expression="job.ownerHost.orElse('[SHROUDED]')"
-				htmlEscape="true" />
-	</td>
-</tr>
 <tr>
 	<th class="lineTitle">Raw request:</th>
 	<td><details><summary><em>Click to show</em></summary>
 	<c:if test="${ not empty job.request }">
 		<pre id="rawRequest"><c:out escapeXml="true"
 				value="${ job.request }" /></pre>
 		<script defer="defer">
+			getJobOwner("rawRequest", "owner");
 			prettyJson("rawRequest");
 		</script>
 	</c:if>

diff --git a/SpiNNaker-allocserv/src/main/webapp/WEB-INF/views/listjobs.jsp b/SpiNNaker-allocserv/src/main/webapp/WEB-INF/views/listjobs.jsp
@@ -80,10 +80,6 @@ limitations under the License.
 								<spring:eval htmlEscape="true"
 										expression="job.owner.get()" />
 							</c:if>
-							<c:if test="${ job.host.present and job.host != '127.0.0.1'}">
-								(<spring:eval htmlEscape="true"
-										expression="job.host.get()" />)
-							</c:if>
 						</td>
 						<td class="textColumn" hidden id="request-${ job.id }">
 							${ job.request }