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.

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

Display delete button only when build is not locked #2483

Merged
merged 1 commit into from Jul 30, 2016

Conversation

3 participants
@jcechace
Contributor

jcechace commented Jul 27, 2016

Partially reverting changes introduced in 818ae76 -- there is no need to display delete button when whyKeepLog != null as the delete will fail anyway.

see https://issues.jenkins-ci.org/browse/JENKINS-26281

At the same time I fixed the formatting as it was a bit of a mess.

Diff: https://github.com/jenkinsci/jenkins/pull/2483/files?w=1

@daniel-beck

This comment has been minimized.

Show comment
Hide comment
@daniel-beck

daniel-beck Jul 28, 2016

Member

@olivergondza Weirdly, your #1511 did not allow builds to be deleted, it just added the UI that resulted in an error?

https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Run.java#L2155...L2162

Any idea what's going on here?

Member

daniel-beck commented Jul 28, 2016

@olivergondza Weirdly, your #1511 did not allow builds to be deleted, it just added the UI that resulted in an error?

https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Run.java#L2155...L2162

Any idea what's going on here?

@olivergondza

This comment has been minimized.

Show comment
Hide comment
@olivergondza

olivergondza Jul 30, 2016

Member

@daniel-beck: Yes, my fix ware wrong. It allowed user to override the message displayed but it was useless as it led to error in 100% cases. This change brings original behaviour back. (The original motivation to enable delete auto-locked matrix builds is resolved separately)

Member

olivergondza commented Jul 30, 2016

@daniel-beck: Yes, my fix ware wrong. It allowed user to override the message displayed but it was useless as it led to error in 100% cases. This change brings original behaviour back. (The original motivation to enable delete auto-locked matrix builds is resolved separately)

@daniel-beck daniel-beck merged commit 972437d into jenkinsci:master Jul 30, 2016

1 check passed

Jenkins This pull request looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment