Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: wizard was not showing up if more than 1 system user

This commit is contained in:
Sam 2017-05-23 11:09:50 -04:00
parent 80af54460a
commit 35bb4ae995
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/006-ensure_login_hint.rb
View File

@ -1,5 +1,5 @@
# Some sanity checking so we don't count on an unindexed column on boot # Some sanity checking so we don't count on an unindexed column on boot
if User.limit(20).count < 20 && User.where(admin: true).count == 1 if User.limit(20).count < 20 && User.where(admin: true).human_users.count == 0
notice = notice =
if GlobalSetting.developer_emails.blank? if GlobalSetting.developer_emails.blank?
"Congratulations, you installed Discourse! Unfortunately, no administrator emails were defined during setup, so finalizing the configuration <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>may be difficult</a>." "Congratulations, you installed Discourse! Unfortunately, no administrator emails were defined during setup, so finalizing the configuration <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>may be difficult</a>."

2
lib/wizard.rb
View File

@ -87,7 +87,7 @@ class Wizard
end end
first_admin_id = User.where(admin: true) first_admin_id = User.where(admin: true)
.where.not(id: Discourse.system_user.id) .human_users
.joins(:user_auth_tokens) .joins(:user_auth_tokens)
.order('user_auth_tokens.created_at') .order('user_auth_tokens.created_at')
.pluck(:id).first .pluck(:id).first