diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 9970ee9c6..e25b4f3f6 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -98,14 +98,14 @@ module WelcomeHelper end def find_all_hot_contest limit=10 - # Contest.reorder("created_on DESC").all.take limit - mix_bid = [] - mix_bid += Contest.reorder("created_on DESC").take(limit).to_a - mix_bid += Bid.visible.where('reward_type = ?', 2).reorder('bids.created_on desc').take(limit).to_a - mix_bid.sort do |older, newer| - newer.created_on - older.created_on - end - mix_bid.take limit + Contest.reorder("created_on DESC").all.take limit + # mix_bid = [] + # mix_bid += Contest.reorder("created_on DESC").take(limit).to_a + # mix_bid += Bid.visible.where('reward_type = ?', 2).reorder('bids.created_on desc').take(limit).to_a + # mix_bid.sort do |older, newer| + # newer.created_on - older.created_on + # end + # mix_bid.take limit end def find_all_hot_softapplication limit=10 diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 6ef2b4796..d8dc45873 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -138,7 +138,7 @@ <%= link_to "更多>>", {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %>