[JENKINS-62448] Enhance information displayed in approval page #300
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,14 +23,6 @@ | |
| background-color: #6c757d; | ||
| } | ||
|
|
||
| .script-approval-page h2 ~ h2 { | ||
| margin-top: 35px; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,106 @@ | ||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:i="jelly:fmt"> | ||
| <div id="pending-approval"> | ||
| <j:set var="pendingScripts" value="${it.getPendingScriptsSorted()}" /> | ||
|
|
||
| <j:choose> | ||
| <j:when test="${pendingScripts.isEmpty()}"> | ||
| <p class="no-pending-script-approvals"> | ||
| <i>${%noPendingScripts}</i> | ||
| </p> | ||
| </j:when> | ||
| <j:otherwise> | ||
| <table class="pane bigtable"> | ||
| <tr> | ||
| <th width="1%"><!-- checkbox --></th> | ||
| <th>${%pendingExpandCode}</th> | ||
| <th>${%pendingLanguage}</th> | ||
| <th>${%contextUser}</th> | ||
| <th>${%contextItem}</th> | ||
| <th title="${%requestApprovalTime_tooltip}" class="info-cursor">${%requestApprovalTime}</th> | ||
| </tr> | ||
| <j:forEach var="ps" items="${pendingScripts}"> | ||
| <tr class="js-selectable-row"> | ||
| <td> | ||
| <input type="checkbox" value="" name="pending-hash" | ||
| data-hash="${ps.hash}" | ||
| id="check-pending-${ps.hash}" | ||
| class="js-checkbox-hash js-bypass-click" /> | ||
| </td> | ||
| <td> | ||
| <div class="toggle-parent" data-expand-target-id="js-${ps.hash}-row" data-expand-codemirror="true"> | ||
| <span class="js-toggle-show-icon js-bypass-click action-link" title="${%pendingExpand_tooltip}">${%pendingExpand}</span> | ||
| <span class="js-toggle-hide-icon js-bypass-click hidden-element action-link" title="${%pendingMinimize_tooltip}">${%pendingMinimize}</span> | ||
| </div> | ||
| </td> | ||
| <td>${ps.language.displayName}</td> | ||
| <td> | ||
| <j:set var="user" value="${ps.context.user}" /> | ||
| <j:choose> | ||
| <j:when test="${user != null}"> | ||
| <a href="${rootURL}/user/${user}" class="model-link">${user}</a> | ||
| </j:when> | ||
| <j:otherwise> | ||
| <span title="${%noRequesterSinceMetadata_tooltip}" class="info-cursor"> | ||
| ${%noRequesterSinceMetadata} | ||
| </span> | ||
| </j:otherwise> | ||
| </j:choose> | ||
| </td> | ||
| <td> | ||
| <j:set var="contextItem" value="${ps.context.item}" /> | ||
| <j:choose> | ||
| <j:when test="${contextItem != null}"> | ||
| <a href="${rootURL}/${contextItem.url}" class="model-link">${contextItem.fullDisplayName}</a> | ||
| </j:when> | ||
| <j:otherwise> | ||
| <span title="${%noContextItemSinceMetadata_tooltip}" class="info-cursor"> | ||
| ${%noContextItemSinceMetadata} | ||
| </span> | ||
| </j:otherwise> | ||
| </j:choose> | ||
| </td> | ||
| <td> | ||
| <j:set var="approvalRequestTime" value="${ps.approvalRequestTimeDate}" /> | ||
| <j:choose> | ||
| <j:when test="${approvalRequestTime != null}"> | ||
| <i:formatDate value="${approvalRequestTime}" type="both" dateStyle="medium" timeStyle="medium"/> | ||
| </j:when> | ||
| <j:otherwise> | ||
| <span title="${%noRequestApprovalTimeSinceMetadata_tooltip}" class="info-cursor"> | ||
| ${%noRequestApprovalTimeSinceMetadata} | ||
| </span> | ||
| </j:otherwise> | ||
| </j:choose> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td colspan="6" id="js-${ps.hash}-row" class="js-async-hidden-element"> | ||
| <f:textarea readonly="readonly" codemirror-mode="${ps.language.codeMirrorMode}" codemirror-config='"readOnly": true' rows="10" cols="80" value="${ps.script}"/> | ||
| </td> | ||
| </tr> | ||
| </j:forEach> | ||
| </table> | ||
|
|
||
| <p class="js-error-no-selected hidden-element error"> | ||
| ${%pendingNoSelectedItemError} | ||
| </p> | ||
|
|
||
| <div class="action-panel"> | ||
| <span class="yui-button"> | ||
| <button class="js-button-pending-approve-all" title="${%approvePending_tooltip}" | ||
| data-container-id="pending-approval" | ||
| data-action-confirm-message="${%approvePending_confirm}" | ||
| data-action-url="${rootURL}/scriptApproval/approvePendingScripts">${%approvePending}</button> | ||
| </span> | ||
| <span class="yui-button"> | ||
| <button class="js-button-pending-deny-all" title="${%denyPending_confirm}" | ||
| data-container-id="pending-approval" | ||
| data-action-confirm-message="${%denyPending_confirm}" | ||
| data-action-url="${rootURL}/scriptApproval/approvePendingScripts">${%denyPending}</button> | ||
| </span> | ||
| </div> | ||
| </j:otherwise> | ||
| </j:choose> | ||
| </div> | ||
| </j:jelly> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,16 @@ | ||
| # pending scripts | ||
| ## table headers | ||
| pendingExpandCode=Code | ||
| pendingLanguage=Language | ||
| contextUser=Requester | ||
| contextItem=Context | ||
| requestApprovalTime=Request date | ||
| requestApprovalTime_tooltip=Inform about when the approval request was made. | ||
|
|
||
| ## table content | ||
| noRequesterSinceMetadata=N/A | ||
| noRequesterSinceMetadata_tooltip=The requester was not recorded. \ | ||
| It could be due to the request being created before the metadata introduction or the code calling this script did not provide user information. | ||
|
Wadeck marked this conversation as resolved.
Outdated
|
||
| noRequestApprovalTimeSinceMetadata=N/A | ||
| noRequestApprovalTimeSinceMetadata_tooltip=It was requested before the introduction of metadata. | ||
| noContextItemSinceMetadata=N/A | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"> | ||
| <div class="pane-frame"> | ||
| <div>Signatures already approved:</div> | ||
|
Wadeck marked this conversation as resolved.
|
||
| <textarea readonly="readonly" id="approvedSignatures" rows="10" cols="80"> | ||
| <j:forEach var="line" items="${it.approvedSignatures}">${line}<st:out value=" "/></j:forEach> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"> | ||
| <div class="pane-frame"> | ||
| <j:choose> | ||
| <j:when test="${it.pendingSignatures.isEmpty()}"> | ||
| <p> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.