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 "force private" logic #31012

Merged
merged 3 commits into from
May 20, 2024
Merged

Fix "force private" logic #31012

merged 3 commits into from
May 20, 2024

Conversation

wxiaoguang
Copy link
Contributor

When creating a repo, the "FORCE_PRIVATE" config option should be respected, readonly doesn't work for checkbox, so it should use disabled attribute.

@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels May 18, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 18, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 18, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels May 18, 2024
@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 May 19, 2024
@silverwind
Copy link
Member

There is one more incorrect readonly checkbox, last line here:

$ rg checkbox.+readonly
templates/repo/migrate/gogs.tmpl:106:               <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/gitlab.tmpl:103:               <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/onedev.tmpl:92:                <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/github.tmpl:106:               <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/git.tmpl:66:               <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/gitea.tmpl:104:                <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/gitbucket.tmpl:108:                <input name="private" type="checkbox" checked readonly>
templates/repo/migrate/codebase.tmpl:92:                <input name="private" type="checkbox" checked readonly>
templates/repo/create.tmpl:53:                <input name="private" type="checkbox" checked readonly>
templates/repo/settings/options.tmpl:33:              <input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>

@wxiaoguang
Copy link
Contributor Author

repo/settings/options.tmpl is special, done in new commit

silverwind
silverwind reviewed May 19, 2024
View reviewed changes
templates/repo/settings/options.tmpl
{{else}}
<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>
<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} disabled{{end}}>
{{if and .Repository.IsPrivate $.ForcePrivate}}<input type="hidden" name="private" value="{{.Repository.IsPrivate}}">{{end}}
Copy link
Member

@silverwind silverwind May 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Is it fine to have two form fields with name=private?

Copy link
Contributor Author

@wxiaoguang wxiaoguang May 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

disabled means it won't be submitted, that's why it needs an extra one 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 May 19, 2024
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 20, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) May 20, 2024 00:26
@wxiaoguang wxiaoguang merged commit edbf74c into go-gitea:main May 20, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 20, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 20, 2024
@wxiaoguang @GiteaBot
Fix "force private" logic (go-gitea#31012)
5f097b2 
When creating a repo, the "FORCE_PRIVATE" config option should be
respected, `readonly` doesn't work for checkbox, so it should use
`disabled` attribute.
@GiteaBot GiteaBot mentioned this pull request May 20, 2024
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 20, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 20, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
ab16ce1 
* giteaofficial/main:
  Fix "force private" logic (go-gitea#31012)
  [skip ci] Updated licenses and gitignores
  Improve reverse proxy documents and clarify the AppURL guessing behavior (go-gitea#31003)
  Fix bug on avatar (go-gitea#31008)
  Clean up revive linter config, tweak golangci output (go-gitea#30980)
  Simplify mirror repository API logic (go-gitea#30963)
wxiaoguang added a commit that referenced this pull request May 20, 2024
@GiteaBot @wxiaoguang
Fix "force private" logic (#31012) (#31021)
ab33b78 
Backport #31012 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang deleted the fix-force-private branch May 20, 2024 02:28
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @silverwind @delvh @GiteaBot