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

Fix project counter in organization/individual profile #28068

Merged
merged 3 commits into from
Nov 18, 2023
Merged

Fix project counter in organization/individual profile #28068

merged 3 commits into from
Nov 18, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Nov 15, 2023

Fix #28052
Before:
image
image

After:
image
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 15, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 15, 2023
@yp05327 yp05327 mentioned this pull request Nov 15, 2023
Closed
@JakobDev
Copy link
Contributor

You should also add this to the API

@yp05327
Copy link
Contributor Author

yp05327 commented Nov 16, 2023

Which API do you mean?
In current design, we don't return these counters in API. 🤔

@JakobDev
Copy link
Contributor

In current design, we don't return these counters in API

Maybe we should add that. I think 3rd Party Apps should also be able to show this counter.

@yp05327
Copy link
Contributor Author

yp05327 commented Nov 17, 2023

Maybe we should do this in another PR?
As we should add these counters in both user and org 's API, if it is necessary.
Then maybe we need to add some tests for this change.
So for a quick fix, this PR will only fix the frontend UI.

@yp05327 yp05327 mentioned this pull request Nov 17, 2023
Open
@yp05327
Copy link
Contributor Author

yp05327 commented Nov 17, 2023

Created an issue for this, let's do this later.

@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 Nov 17, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 17, 2023
@denyskon denyskon added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Nov 17, 2023
@denyskon denyskon added this to the 1.22.0 milestone Nov 17, 2023
@denyskon denyskon added the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Nov 17, 2023
@GiteaBot GiteaBot removed the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Nov 17, 2023
@denyskon denyskon added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. backport/v1.21 This PR should be backported to Gitea 1.21 labels Nov 17, 2023
@lunny lunny merged commit e883774 into go-gitea:main Nov 18, 2023
25 checks passed
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @yp05327, please send one manually. 🍵

go run ./contrib/backport 28068
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Nov 18, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 20, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
a44608a 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Update JS and PY dependencies (go-gitea#28120)
  Decrease issue font size in project template (go-gitea#28054)
  Require clear descriptions both for feature and breaking PRs prior to the merge (go-gitea#28112)
  add skip ci functionality (go-gitea#28075)
  Fix project counter in organization/individual profile (go-gitea#28068)
  Fix Show/hide filetree button on small displays (go-gitea#27881)
  Change default size of attachments and repo files (go-gitea#28100)
  Fix Matrix and MSTeams nil dereference (go-gitea#28089)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@yp05327 @fuxiaohei
Fix project counter in organization/individual profile (go-gitea#28068)
033141b 
Fix go-gitea#28052
Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/5f299983-4b38-4d68-ac0e-4be3c62c0558)

![image](https://github.com/go-gitea/gitea/assets/18380374/f0e12afd-483b-4882-80e9-0261beb3fe0c)

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/47cccb7b-bb35-4a7d-9c5b-83133be0323a)

![image](https://github.com/go-gitea/gitea/assets/18380374/77825c0c-4bf2-4762-83a2-1a5a173cc22d)
@yp05327 yp05327 deleted the fix-user-project-count branch February 1, 2024 00:03
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 16, 2024
@lunny lunny added the backport/done All backports for this PR have been created label Feb 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@denyskon denyskon denyskon approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Project counter missing, again
5 participants
@yp05327 @JakobDev @GiteaBot @lunny @denyskon