Support org/user level projects #22235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lunny
added
the
type/feature
|
Can we rename projects to boards? That naming is very confusing imho |
GiteaBot
added
the
lgtm/need 2
|
Wasn't there even a PR already for that? Something like #22237? |
6543
reviewed
Dec 29, 2022
6543
reviewed
Dec 29, 2022
6543
reviewed
Dec 29, 2022
Codecov Report
@@ Coverage Diff @@
## main #22235 +/- ##
=======================================
Coverage ? 47.93%
=======================================
Files ? 1047
Lines ? 143029
Branches ? 0
=======================================
Hits ? 68558
Misses ? 66279
Partials ? 8192
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
wolfogre
approved these changes
Jan 16, 2023
GiteaBot
added
lgtm/need 1
TobiasNils
added a commit
to TobiasNils/gitea-1
that referenced
this pull request
Jan 17, 2023
appleboy
approved these changes
Jan 20, 2023
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
|
make LG-TM work |
lunny
removed
the
reviewed/wait-merge
delvh
reviewed
Jan 20, 2023
services/context/user.go
Outdated
Comment on lines
60
to
64
| } else { | ||
| if ctx.ContextUser.IsOrganization() { | ||
| ctx.Org.Organization = (*org_model.Organization)(ctx.ContextUser) | ||
| ctx.Data["Org"] = ctx.Org.Organization | ||
| } |
There was a problem hiding this comment.
Suggested change
| } else { | |
| if ctx.ContextUser.IsOrganization() { | |
| ctx.Org.Organization = (*org_model.Organization)(ctx.ContextUser) | |
| ctx.Data["Org"] = ctx.Org.Organization | |
| } | |
| } else if ctx.ContextUser.IsOrganization() { | |
| ctx.Org.Organization = (*org_model.Organization)(ctx.ContextUser) | |
| ctx.Data["Org"] = ctx.Org.Organization |
Comment on lines
+85
to
+89
| Title string `xorm:"INDEX NOT NULL"` | ||
| Description string `xorm:"TEXT"` | ||
| OwnerID int64 `xorm:"INDEX"` | ||
| Owner *user_model.User `xorm:"-"` | ||
| RepoID int64 `xorm:"INDEX"` |
There was a problem hiding this comment.
Suggested change
| Title string `xorm:"INDEX NOT NULL"` | |
| Description string `xorm:"TEXT"` | |
| OwnerID int64 `xorm:"INDEX"` | |
| Owner *user_model.User `xorm:"-"` | |
| RepoID int64 `xorm:"INDEX"` | |
| Title string `xorm:"INDEX UNIQUE(title_owner_repo) NOT NULL"` | |
| Description string `xorm:"TEXT"` | |
| OwnerID int64 `xorm:"INDEX UNIQUE(title_owner_repo)"` | |
| Owner *user_model.User `xorm:"-"` | |
| RepoID int64 `xorm:"INDEX UNIQUE(title_owner_repo)"` |
I think this constraint makes sense.
However, if we add it, we should probably mark this PR as breaking as it would require to rename existing duplicated titles (that should not have ever been used already)
| @@ -1162,7 +1202,7 @@ func RegisterRoutes(m *web.Route) { | |||
| m.Group("/projects", func() { | |||
| m.Get("", repo.Projects) | |||
| m.Get("/{id}", repo.ViewProject) | |||
| m.Group("", func() { | |||
| m.Group("", func() { //nolint:dupl | |||
Comment on lines
+60
to
+61
| } else { | ||
| if ctx.ContextUser.IsOrganization() { |
Comment on lines
+36
to
+39
| if teamUnit.Type != tp { | ||
| continue | ||
| } | ||
| if teamUnit.AccessMode > maxAccess { |
There was a problem hiding this comment.
Suggested change
| if teamUnit.Type != tp { | |
| continue | |
| } | |
| if teamUnit.AccessMode > maxAccess { | |
| if teamUnit.Type == tp && teamUnit.AccessMode > maxAccess { |
?
|
@delvh just send a pull rever to this ... |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #13405