Skip to content

Users should not be able to prohibit their own login #10970

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

Merged
merged 8 commits into from
Apr 6, 2020
Merged

Users should not be able to prohibit their own login #10970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c120af
ui: limit managers prohibit themself to login
a1012112796 Apr 5, 2020
065ee36
skip self Prohibit Login in post event handle
a1012112796 Apr 5, 2020
99f2142
fix comment
a1012112796 Apr 5, 2020
48709f8
Merge branch 'master' into block_login_limit
zeripath Apr 5, 2020
c8719ae
Merge branch 'master' into block_login_limit
zeripath Apr 5, 2020
92bf55d
Merge branch 'master' into block_login_limit
jolheiser Apr 5, 2020
b440255
Merge branch 'master' into block_login_limit
lunny Apr 6, 2020
c8e0a42
Merge branch 'master' into block_login_limit
a1012112796 Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion routers/admin/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,13 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) {
u.AllowGitHook = form.AllowGitHook
u.AllowImportLocal = form.AllowImportLocal
u.AllowCreateOrganization = form.AllowCreateOrganization
u.ProhibitLogin = form.ProhibitLogin

// skip self Prohibit Login
if ctx.User.ID == u.ID {
u.ProhibitLogin = false
} else {
u.ProhibitLogin = form.ProhibitLogin
}

if err := models.UpdateUser(u); err != nil {
if models.IsErrEmailAlreadyUsed(err) {
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/user/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<div class="inline field">
<div class="ui checkbox">
<label><strong>{{.i18n.Tr "admin.users.prohibit_login"}}</strong></label>
<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}}>
<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
</div>
</div>
<div class="inline field">
Expand Down