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

Use project.IconName instead of repeated unreadable if-else chains #23538

Merged
merged 4 commits into from
Mar 19, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Mar 17, 2023

The project type will be changed in #23353, so the old fix #23325 will not work as well.

And I also found that there were some problems in the old fix....

@yp05327
Copy link
Contributor Author

yp05327 commented Mar 17, 2023

emmmm, I used a new design in #23437
I will use the new design in this PR.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 17, 2023
@yp05327 yp05327 changed the title Use symlink icon for org-wide projects (for the db change) Add project.IconName Mar 17, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 18, 2023
@delvh delvh added type/refactoring Existing code has been cleaned up. There should be no new functionality. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 18, 2023
@delvh delvh changed the title Add project.IconName Use project.IconName instead of repeated unreadableif-else chains Mar 18, 2023
@delvh delvh changed the title Use project.IconName instead of repeated unreadableif-else chains Use project.IconName instead of repeated unreadable if-else chains Mar 18, 2023
@yardenshoham yardenshoham added this to the 1.20.0 milestone Mar 18, 2023
@yardenshoham yardenshoham added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 18, 2023
@yp05327
Copy link
Contributor Author

yp05327 commented Mar 19, 2023

This PR should be backport to 1.19.

Im sorry I made a mistake in old fix here:
https://github.com/go-gitea/gitea/pull/23325/files#diff-566953f43d56eb333da2f821be332ef8e5885bc9ab628484309a1ad83149892aR205
It should be {{if .Project.IsOrganizationProject}}

@lunny
Copy link
Member

lunny commented Mar 19, 2023

This PR should be backport to 1.19.

Im sorry I made a mistake in old fix here: https://github.com/go-gitea/gitea/pull/23325/files#diff-566953f43d56eb333da2f821be332ef8e5885bc9ab628484309a1ad83149892aR205 It should be {{if .Project.IsOrganizationProject}}

Maybe you can send a standalone PR to fix that and keep this not backport?

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 19, 2023
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Mar 19, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #23538 (6e5bcec) into main (f521e88) will increase coverage by 0.02%.
The diff coverage is 44.65%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main   #23538      +/-   ##
==========================================
+ Coverage   47.14%   47.16%   +0.02%     
==========================================
  Files        1149     1154       +5     
  Lines      151446   152271     +825     
==========================================
+ Hits        71397    71825     +428     
- Misses      71611    71966     +355     
- Partials     8438     8480      +42     
Impacted Files Coverage Δ
cmd/dump.go 0.67% <0.00%> (ø)
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.64% <0.00%> (-0.08%) ⬇️
models/packages/package.go 45.45% <0.00%> (-1.13%) ⬇️
models/user/search.go 77.50% <0.00%> (-6.29%) ⬇️
modules/actions/github.go 0.00% <0.00%> (ø)
modules/actions/workflows.go 0.00% <0.00%> (ø)
modules/doctor/storage.go 31.93% <0.00%> (ø)
modules/setting/git.go 45.45% <ø> (ø)
modules/storage/minio.go 1.51% <0.00%> (-0.06%) ⬇️
... and 51 more

... and 11 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@lafriks lafriks merged commit 1a4efa0 into go-gitea:main Mar 19, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 20, 2023
* giteaofficial/main: (23 commits)
  Display the version of runner in the runner list (go-gitea#23490)
  Add `.patch` to `attachment.ALLOWED_TYPES` (go-gitea#23580)
  Sort Python package descriptors by version to mimic PyPI format (go-gitea#23550)
  Use `project.IconName` instead of repeated unreadable `if-else` chains (go-gitea#23538)
  Match api migration behavior to web behavior (go-gitea#23552)
  Fix dropdown icon misalignment when using fomantic icon (go-gitea#23558)
  Enable color for consistency checks diffs (go-gitea#23563)
  [skip ci] Updated translations via Crowdin
  Fix sticky header in diff view (go-gitea#23554)
  Fix some broken css (go-gitea#23560)
  Fix JS error on compare page (go-gitea#23551)
  Upgrade to npm lockfile v3 and explicitely set it (go-gitea#23561)
  Fix long name ui issues and label ui issue  (go-gitea#23541)
  Remove worker-loader (go-gitea#23548)
  [skip ci] Updated translations via Crowdin
  Return `repository` in npm package metadata endpoint (go-gitea#23539)
  Fix diff detail buttons wrapping, use tippy for review box (go-gitea#23271)
  Do not store user projects as organization projects (go-gitea#23353)
  Imrove scroll behavior to hash issuecomment(scroll position, auto expand if file is folded, and on refreshing) (go-gitea#23513)
  Increase horizontal page padding (go-gitea#23507)
  ...
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants