Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-69489] - Hide restart checkbox if the controller doesn't support it #7740

Merged
merged 2 commits into from
Mar 20, 2023
Merged

[JENKINS-69489] - Hide restart checkbox if the controller doesn't support it #7740

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa8315
[JENKINS-69489] Hide restart checkbox if the controller doesn't suppo…
NotMyFault Mar 17, 2023
e68b01f
Merge branch 'master' into update-center-checkbox-fix
NotMyFault Mar 17, 2023
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
9 changes: 3 additions & 6 deletions core/src/main/resources/hudson/model/UpdateCenter/body.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,15 @@ THE SOFTWARE.
<l:icon class="icon-red icon-md"/>
<l:icon class="icon-nobuilt icon-md"/>
</div>
<p class="info jenkins-checkbox" style="font-weight: normal">
<p class="info">
<j:if test="${app.lifecycle.canRestart()}">
<j:if test="${app.isQuietingDown() or it.isRestartScheduled()}">
<input id="scheduleRestartCheckbox" type="checkbox" checked="checked" />
<f:checkbox checked="true" id="scheduleRestartCheckbox" name="scheduleRestart" title="${%warning}" />
</j:if>
<j:if test="${!app.isQuietingDown() and !it.isRestartScheduled()}">
<input id="scheduleRestartCheckbox" type="checkbox" />
<f:checkbox readonly="true" id="scheduleRestartCheckbox" name="scheduleRestart" title="${%warning}" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NotMyFault Why did you (attempt to) make the checkbox here readonly? It doesn't work because 4cac031#diff-6fbee721e02514a54ede8e6e5ed37d3af538239842117a33b7ee905b0a518c81R6 is wrong. Asking because I want to fix my bug and want to ensure I'm not introducing a different one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, actually. I think the attribute is obsolete and can be removed, given the if-condition represents the default state and the checkbox should work here.

</j:if>
</j:if>
<label for="scheduleRestartCheckbox">
${%warning}
</label>
</p>
</l:isAdmin>
</form>
Expand Down