Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/trustie_hacks_controller.rb

@@ -16,6 +16,7 @@ class TrustieHacksController < ApplicationController
     end
 
     @hackathon_users_count = hacks ? 0 : hacks.sum(:hack_users_count)
+    @hacks_count = hacks.count
 
     @hacks = hacks.page(page).per(limit)
 

app/views/trustie_hacks/index.json.jbuilder

@@ -2,7 +2,7 @@ json.hackathon do
   json.(@hackathon, :id, :name, :description)
   json.hackathon_users_count @hackathon_users_count
 end
-
+json.hacks_count @hacks_count
 json.hacks @hacks do |hack|
   json.(hack, :id, :name, :description, :hack_users_count)
   json.entry_info hack.entry_info(current_user.id)