github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:41:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: change password form validation should instruct admins to use min password length for admin accounts

Browse Source
This commit is contained in:
Neil Lalonde
2017-11-07 16:14:47 -05:00
parent 3f2105db85
commit d7880af0bb
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/users_controller.rb
View File

@ -465,7 +465,10 @@ class UsersController < ApplicationController
if @error
render layout: 'no_ember'
else
store_preloaded("password_reset", MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email)))
store_preloaded(
"password_reset",
MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin?)
)
end
return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user)
end
@ -477,7 +480,8 @@ class UsersController < ApplicationController
success: false,
message: @error,
errors: @user&.errors.to_hash,
is_developer: UsernameCheckerService.is_developer?(@user.email)
is_developer: UsernameCheckerService.is_developer?(@user.email),
admin: @user.admin?
}
else
render json: {
@ -488,7 +492,7 @@ class UsersController < ApplicationController
}
end
else
render json: { is_developer: UsernameCheckerService.is_developer?(@user.email) }
render json: { is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin? }
end
end
end