Use form for admin purge user #21070
Merged
Conversation
This file contains hidden or 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
Signed-off-by: jolheiser <[email protected]>
lunny
added
the
skip-changelog
silverwind
approved these changes
Sep 5, 2022
GiteaBot
added
the
lgtm/need 1
wxiaoguang
reviewed
Sep 8, 2022
| @@ -151,7 +151,7 @@ | |||
|
|
|||
| <div class="field"> | |||
| <button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button> | |||
| <div class="ui red button show-modal" data-modal="#delete-user-modal" data-url="{{$.Link}}/delete" data-id="{{.User.ID}}">{{.locale.Tr "admin.users.delete_account"}}</div> | |||
| <div class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</div> | |||
There was a problem hiding this comment.
Two things in my mind:
- Here the
data-id="{{.User.ID}}"is removed, is it correct? IIRC the JS code will fill somedata-xxxattributes into the form fields. - In Add option to purge users #18064, the button's CSS class name was changed from
delete-buttontoshow-modal, I am not sure what are the differences and concerns. Now the dialog layout is changed again, could @zeripath take a look at them?
There was a problem hiding this comment.
I will re-test, but you may be right about 1.
About 2, delete-button is how we link it to the generic JS version afaik.
There was a problem hiding this comment.
show-modal is also a generic JS version .... indeed, the code for show-modal and delete-button are quite similar, that's why I am confused about they two.
There was a problem hiding this comment.
Okay, I've ran some tests locally again.
The reason data-id is no longer needed is because this page has the user ID in the URL, which is what is used when deleting.
At the very least, I was able to:
- Attempt to delete a user and correctly get back "You can't, they still have repos", and then
- Select the purge option, which deleted them successfully.
There was a problem hiding this comment.
Interesting, it seems to happen to work 😀
If @zeripath doesn't have more questions, I will vote L-G-T-M later.
Signed-off-by: jolheiser <[email protected]>
wxiaoguang
approved these changes
Sep 10, 2022
GiteaBot
added
lgtm/done
|
make lgtm work |
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Sep 13, 2022
* upstream/main: Update docs comparison.zh-cn.md (go-gitea#21035) Use form for admin purge user (go-gitea#21070) Make labels clickable in the comments section. (go-gitea#21137) Remove fomantic image module (go-gitea#21145) [skip ci] Updated translations via Crowdin Show .editorconfig errors in frontend (go-gitea#21088) Update JS dependencies and lint (go-gitea#21144) Fix PlantUML example in document (go-gitea#21142) chore(security): Support Go Vulnerability Management (go-gitea#21139) [skip ci] Updated licenses and gitignores [skip ci] Updated translations via Crowdin Improve commit status icons (go-gitea#21124) Center-aligning content of WebAuthN page (go-gitea#21127) Allow poster to choose reviewers (go-gitea#21084) Generate go-licenses during tidy again (go-gitea#21108)
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.
Fixes #20998
The basic modal actions were set up for basic confirmation-style modals, however this modal also has a special form input, which instead requires a form in the modal itself.
The basic modal actions are indirectly controlled by JS and are simple
<div>elements, whereas this requires a<button>to submit.This appears to be similar to how we do it in (for example) the repo deletion modal.