Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->

<!--
Displays the console output
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<j:new className="jenkins.run.ChangesTab" var="it">
<j:arg value="${it}"/>
</j:new>

<l:run-subpage>
<l:app-bar title="${it.displayName}" headingLevel="h2" />
<l:app-bar title="${it.displayName}">
<l:details-bar it="${it.object}" />
</l:app-bar>

<j:set var="it" value="${it.object}" />
<j:set var="changeSets" value="${it.object.changeSets}" />

<j:choose>
<j:when test="${it.hasChangeSetComputed()}">
<st:include page="index.jelly" it="${it.changeSet}" />
</j:when>
<j:when test="${it.building}">
${%Not yet determined}
<j:when test="${!empty(changeSets)}">
<div class="jenkins-card">
<div class="jenkins-card__content">
<j:forEach var="changeSet" items="${changeSets}">
<st:include page="index.jelly" it="${changeSet}" />
</j:forEach>
</div>
</div>
</j:when>
<j:otherwise>
${%Failed to determine} (<a href="${h.getConsoleUrl(it)}">${%log}</a>)
<l:notice icon="${it.iconFileName}" title="${%Failed to determine}">
<a href="${h.getConsoleUrl(it.object)}">${%log}</a>
</l:notice>
</j:otherwise>
</j:choose>
</l:run-subpage>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:p="/lib/hudson/project">
<j:choose>
<j:when test="${newBuildPage}">
<l:task href="${buildUrl.baseUrl}/changes" icon="symbol-changes" title="${%Changes}"/>
<j:choose>
<j:when test="${h.hasPermission(it,it.UPDATE)}">
<l:task icon="symbol-edit-note" href="${buildUrl.baseUrl}/configure" title="${%Edit Build Information}"/>
Expand Down
17 changes: 5 additions & 12 deletions core/src/main/resources/jenkins/run/ChangesTab/widget.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,10 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
<l:card title="${%Changes}" expandable="changes">
<j:choose>
<j:when test="${it.hasChangeSetComputed()}">
<st:include page="index.jelly" it="${it.changeSet}" />
</j:when>
<j:when test="${it.building}">
${%Not yet determined}
</j:when>
<j:otherwise>
${%Failed to determine} (<a href="${h.getConsoleUrl(it)}">${%log}</a>)
</j:otherwise>
</j:choose>
<l:card title="${it.displayName}" expandable="${it.urlName}">
<j:set var="changeSets" value="${it.object.changeSets}" />
<j:forEach var="changeSet" items="${changeSets}">
<st:include it="${changeSet}" page="digest.jelly" />
</j:forEach>
</l:card>
</j:jelly>
36 changes: 20 additions & 16 deletions core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,24 @@ THE SOFTWARE.
-->

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson">
<j:set var="changeSets" value="${it.changeSets}"/>
<table>
<t:summary icon="symbol-changes">
<j:choose>
<j:when test="${!changeSets.isEmpty()}">
<j:forEach var="changeSet" items="${changeSets}">
<st:include it="${changeSet}" page="digest.jelly"/>
</j:forEach>
</j:when>
<j:otherwise>
<st:include class="hudson.scm.EmptyChangeLogSet" page="digest.jelly" />
</j:otherwise>
</j:choose>
</t:summary>
</table>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson" xmlns:l="/lib/layout">
<l:userExperimentalFlag var="newBuildPage" flagClassName="jenkins.model.experimentalflags.NewBuildPageUserExperimentalFlag" />

<j:if test="${!newBuildPage}">
<j:set var="changeSets" value="${it.changeSets}"/>
<table>
<t:summary icon="symbol-changes">
<j:choose>
<j:when test="${!changeSets.isEmpty()}">
<j:forEach var="changeSet" items="${changeSets}">
<st:include it="${changeSet}" page="digest.jelly"/>
</j:forEach>
</j:when>
<j:otherwise>
<st:include class="hudson.scm.EmptyChangeLogSet" page="digest.jelly" />
</j:otherwise>
</j:choose>
</t:summary>
</table>
</j:if>
</j:jelly>
Loading