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

Add cardtype to org/user level project on creation, edit and view #24043

Merged
merged 5 commits into from
Apr 11, 2023

Conversation

HesterG
Copy link
Contributor

@HesterG HesterG commented Apr 11, 2023

Part of #23318

The way to fix the missing cardtype for user/org level projects in this PR is to port the cardtype related part from #22112 to org/user level projects' template and router functions.

Before:
截屏2023-04-11 13 55 49

截屏2023-04-11 13 55 59

After:
Create
截屏2023-04-11 13 27 16

Edit
截屏2023-04-11 13 27 05

View
截屏2023-04-11 13 26 56

@lunny lunny added type/bug topic/ui Change the appearance of the Gitea UI outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 11, 2023
@lunny lunny added this to the 1.20.0 milestone Apr 11, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 11, 2023
@codecov-commenter
Copy link

codecov-commenter commented Apr 11, 2023

Codecov Report

Merging #24043 (18b3973) into main (f521e88) will decrease coverage by 0.17%.
The diff coverage is 32.59%.

❗ Current head 18b3973 differs from pull request most recent head 2fedb30. Consider uploading reports for the commit 2fedb30 to get more accurate results

@@            Coverage Diff             @@
##             main   #24043      +/-   ##
==========================================
- Coverage   47.14%   46.98%   -0.17%     
==========================================
  Files        1149     1163      +14     
  Lines      151446   153673    +2227     
==========================================
+ Hits        71397    72196     +799     
- Misses      71611    72978    +1367     
- Partials     8438     8499      +61     
Impacted Files Coverage Δ
cmd/dump.go 0.64% <0.00%> (-0.03%) ⬇️
cmd/mailer.go 0.00% <0.00%> (ø)
cmd/manager.go 0.00% <0.00%> (ø)
cmd/manager_logging.go 0.00% <0.00%> (ø)
cmd/migrate_storage.go 5.76% <0.00%> (-0.12%) ⬇️
cmd/restore_repo.go 0.00% <0.00%> (ø)
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.63% <0.00%> (-0.10%) ⬇️
models/actions/runner.go 1.44% <ø> (ø)
models/organization/org_user.go 80.51% <0.00%> (-12.02%) ⬇️
... and 62 more

... and 127 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.

@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 Apr 11, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
@silverwind silverwind enabled auto-merge (squash) April 11, 2023 17:37
@silverwind silverwind merged commit 6a4be2c into go-gitea:main Apr 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
@GiteaBot
Copy link
Contributor

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 11, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 12, 2023
* upstream/main:
  Add popup to hashed comments/pull requests/issues in file editing/adding preview tab (go-gitea#24040)
  Use reactive store to share data between components (go-gitea#23996)
  [skip ci] Updated translations via Crowdin
  Fix accidental overwriting of LDAP team memberships (go-gitea#24050)
  Add cardtype to org/user level project on creation, edit and view (go-gitea#24043)
  Fix branch protection priority (go-gitea#24045)
  Update documentation to explain which projects allow Gitea to host static pages (go-gitea#23993)
  Fix date  display bug (go-gitea#24047)
  Fine tune markdown editor toolbar (go-gitea#24046)
  Add tooltips for MD editor buttons and add `muted` class for buttons (go-gitea#23896)
  Prefer native parser for SSH public key parsing (go-gitea#23798)
@HesterG HesterG deleted the add-cardtype-to-org-project branch April 12, 2023 04:04
silverwind added a commit that referenced this pull request Apr 12, 2023
…4043) (#24066)

Backport #24043 

Part of #23318

The way to fix the missing cardtype for user/org level projects in this
PR is to port the cardtype related part from #22112 to org/user level
projects' template and router functions.

Before:
<img width="1135" alt="截屏2023-04-11 13 55 49"
src="https://user-images.githubusercontent.com/17645053/231069068-ba897129-ae90-4aa0-9b0f-468bf5c65375.png">

<img width="1131" alt="截屏2023-04-11 13 55 59"
src="https://user-images.githubusercontent.com/17645053/231069084-279f6681-5a10-42da-b5a8-2b0ba47c7078.png">


After:
Create
<img width="835" alt="截屏2023-04-11 13 27 16"
src="https://user-images.githubusercontent.com/17645053/231064445-0d6e12bd-5725-48db-a102-80e7472757c2.png">

Edit
<img width="852" alt="截屏2023-04-11 13 27 05"
src="https://user-images.githubusercontent.com/17645053/231064503-c70525cd-1038-43ec-8d93-8b8d95d183d4.png">

View
<img width="1329" alt="截屏2023-04-11 13 26 56"
src="https://user-images.githubusercontent.com/17645053/231064529-26023c85-698b-4b2e-af02-45f9820c77ec.png">

---------

Co-authored-by: silverwind <me@silverwind.io>
@lunny lunny added the backport/done All backports for this PR have been created label Jul 26, 2023
@GiteaBot
Copy link
Contributor

We lock pull requests 3 months after they were closed. If there's any need for further discussion, please open a new issue. 🍵

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants