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.

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

[JENKINS-72407] missing folder icon #8872

Merged
merged 1 commit into from
Jan 25, 2024

Conversation

mawinter69
Copy link
Contributor

@mawinter69 mawinter69 commented Jan 17, 2024

when a folder icon is provided and relies on the getImageOf method this leads to a missing icon, e.g. gitlab branch source or when using a custom folder icon
So fall back to the ballColorTd when we have no iconname which handles all cases properly.

See JENKINS-72407.

Testing done

  • Install custom-folder-icon plugin,
  • create folder and configure it to use a custom icon
  • go to jenkins root dashboard, the icon should be properly shown

Proposed changelog entries

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

when a folder icon is provided and relies on the getImageOf method this
leads to a missing icon, e.g. gitlab branch source or when using a
custom folder icon
So fall back to the ballColorTd when we have no iconname which handles
all cases properly.
@MarkEWaite MarkEWaite added the bug For changelog: Minor bug. Will be listed after features label Jan 17, 2024
Copy link
Contributor

@Pldi23 Pldi23 left a comment

Choose a reason for hiding this comment

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

I manually tested use cases reported in https://issues.jenkins.io/browse/JENKINS-72576, the fix works fine. Thank you.

Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jan 19, 2024
@MarkEWaite MarkEWaite merged commit 70f2237 into jenkinsci:master Jan 25, 2024
16 checks passed
@aneveux
Copy link
Member

aneveux commented Jan 25, 2024

Hello 👋

I see in the JENKINS-72407 jira ticket that this issue is labeled with lts-candidate. Does this mean that this Pull Request will be backported to a 2.440.1 version of Jenkins for the February release?

ping @MarkEWaite who merged this Pull Request.

Thanks a lot for the info!

@MarkEWaite
Copy link
Contributor

MarkEWaite commented Jan 25, 2024

I see in the JENKINS-72407 jira ticket that this issue is labeled with lts-candidate. Does this mean that this Pull Request will be backported to a 2.440.1 version of Jenkins for the February release?

Thanks for asking. Yes, the intent is that it should be backported to 2.440.1 along with the security fixes.

The Jenkins 2.440.1 LTS release checklist is available as:

There is one more pull request that is not yet merged by but that I believe should be backported to 2.440.1.

@aneveux
Copy link
Member

aneveux commented Jan 25, 2024

Awesome! Thanks a lot @MarkEWaite ❤️

@MarkEWaite
Copy link
Contributor

@aneveux I'd love it if you could review the other pending pull request.

NotMyFault pushed a commit to NotMyFault/jenkins that referenced this pull request Feb 8, 2024
when a folder icon is provided and relies on the getImageOf method this
leads to a missing icon, e.g. gitlab branch source or when using a
custom folder icon
So fall back to the ballColorTd when we have no iconname which handles
all cases properly.

(cherry picked from commit 70f2237)
krisstern pushed a commit to krisstern/jenkins that referenced this pull request Mar 5, 2024
when a folder icon is provided and relies on the getImageOf method this
leads to a missing icon, e.g. gitlab branch source or when using a
custom folder icon
So fall back to the ballColorTd when we have no iconname which handles
all cases properly.

(cherry picked from commit 70f2237)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants