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

Merge pull request #975 from jd-erreape/username_refactor

Browse Source 
[WIP] Refactored user_name suggestion methods into a module
This commit is contained in:
Robin Ward
2013-06-06 08:12:29 -07:00
parent 0990af3e1c 96d23ddd8d
commit bac03a3369
6 changed files with 216 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users_controller.rb
View File

@ -1,4 +1,5 @@
require_dependency 'discourse_hub'
require_dependency 'user_name_suggester'
class UsersController < ApplicationController
@ -102,7 +103,7 @@ class UsersController < ApplicationController
if User.username_available?(params[:username])
render json: {available: true}
else
render json: {available: false, suggestion: User.suggest_username(params[:username])}
render json: {available: false, suggestion: UserNameSuggester.suggest(params[:username])}
end
else
@ -133,7 +134,7 @@ class UsersController < ApplicationController
end
elsif available_globally && !available_locally
# Already registered on this site with the matching nickname and email address. Why are you signing up again?
render json: {available: false, suggestion: User.suggest_username(params[:username])}
render json: {available: false, suggestion: UserNameSuggester.suggest(params[:username])}
else
# Not available anywhere.
render json: {available: false, suggestion: suggestion_from_discourse_hub}
@ -202,7 +203,7 @@ class UsersController < ApplicationController
message: I18n.t(
"login.errors",
errors:I18n.t(
"login.not_available", suggestion: User.suggest_username(params[:username])
"login.not_available", suggestion: UserNameSuggester.suggest(params[:username])
)
)
}