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

Use consistent new-style hashes in render calls *twitch*

Browse Source
This commit is contained in:
Sarah Vessels
2013-03-22 14:08:11 -04:00
parent 3d4fb43c73
commit 54c7b1ab63
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/users_controller.rb
View File

@ -43,7 +43,7 @@ class UsersController < ApplicationController
u.auto_track_topics_after_msecs = params[:auto_track_topics_after_msecs].to_i if params[:auto_track_topics_after_msecs]
u.new_topic_duration_minutes = params[:new_topic_duration_minutes].to_i if params[:new_topic_duration_minutes]
[:email_digests, :email_direct, :email_private_messages,
[:email_digests, :email_direct, :email_private_messages,
:external_links_in_new_tab, :enable_quoting].each do |i|
if params[i].present?
u.send("#{i.to_s}=", params[i] == 'true')
@ -138,7 +138,7 @@ class UsersController < ApplicationController
if params[:password_confirmation] != honeypot_value || params[:challenge] != challenge_value.try(:reverse)
# Don't give any indication that we caught you in the honeypot
return render(:json => {success: true, active: false, message: I18n.t("login.activate_email", email: params[:email]) })
return render(json: {success: true, active: false, message: I18n.t("login.activate_email", email: params[:email]) })
end
user = User.new
@ -196,14 +196,14 @@ class UsersController < ApplicationController
session[:authentication] = nil
# JSON result
render :json => {success: true, active: active_result, message: msg }
render json: {success: true, active: active_result, message: msg }
else
render :json => {success: false, message: I18n.t("login.errors", errors: user.errors.full_messages.join("\n"))}
render json: {success: false, message: I18n.t("login.errors", errors: user.errors.full_messages.join("\n"))}
end
rescue ActiveRecord::StatementInvalid
render :json => {success: false, message: I18n.t("login.something_already_taken")}
render json: {success: false, message: I18n.t("login.something_already_taken")}
rescue DiscourseHub::NicknameUnavailable
render :json => {success: false, message: I18n.t("login.errors", errors:I18n.t("login.not_available", suggestion: User.suggest_username(params[:username])) )}
render json: {success: false, message: I18n.t("login.errors", errors:I18n.t("login.not_available", suggestion: User.suggest_username(params[:username])) )}
rescue RestClient::Forbidden
render json: {errors: [I18n.t("discourse_hub.access_token_problem")]}
end
@ -257,7 +257,7 @@ class UsersController < ApplicationController
end
end
end
render :layout => 'no_js'
render layout: 'no_js'
end
def change_email
@ -285,7 +285,7 @@ class UsersController < ApplicationController
else
flash[:error] = I18n.t('change_email.error')
end
render :layout => 'no_js'
render layout: 'no_js'
end
def activate_account
@ -303,7 +303,7 @@ class UsersController < ApplicationController
else
flash[:error] = I18n.t('activation.already_done')
end
render :layout => 'no_js'
render layout: 'no_js'
end
def send_activation_email