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

Fix the build. 

6edf285c89
This commit is contained in:
Guo Xiang Tan 2019-01-17 17:28:00 +08:00
parent 6edf285c89
commit 234e0f35c5
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,27 @@
# 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 ActiveRecord::Base.connection.table_exists?(:users) && begin
User.limit(20).count < 20 && if ActiveRecord::Base.connection.table_exists?(:users) &&
User.where(admin: true).human_users.count == 0 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/create-admin-account-from-console/17274'>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/create-admin-account-from-console/17274'>may be difficult</a>."
else
emails = GlobalSetting.developer_emails.split(",")
if emails.length > 1
emails = emails[0..-2].join(', ') << " or #{emails[-1]} "
else else
emails = emails[0] emails = GlobalSetting.developer_emails.split(",")
if emails.length > 1
emails = emails[0..-2].join(', ') << " or #{emails[-1]} "
else
emails = emails[0]
end
"Congratulations, you installed Discourse! Register a new admin account with #{emails} to finalize configuration."
end end
"Congratulations, you installed Discourse! Register a new admin account with #{emails} to finalize configuration."
end
if notice != SiteSetting.global_notice if notice != SiteSetting.global_notice
SiteSetting.global_notice = notice SiteSetting.global_notice = notice
SiteSetting.has_login_hint = true SiteSetting.has_login_hint = true
end
end end
rescue ActiveRecord::NoDatabaseError
# Database might not have been created
end end