diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 2d45c0b83..2a00d69bf 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -52,7 +52,7 @@ <% else %> <% count=activity.children.count%> <% end %> -

<%= count>0 ? "(#{count})" : "" %>回复|<%= get_praise_num(activity) > 0 ? "(#{get_praise_num(activity)})" : "" %>

+

<%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>

diff --git a/db/schema.rb b/db/schema.rb index 70fb756fb..ed3ff4b0b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -334,6 +334,17 @@ ActiveRecord::Schema.define(:version => 20160427075457) do t.boolean "diff_all" end + create_table "code_tests", :force => true do |t| + t.integer "homework_id" + t.integer "wait_time", :default => 0 + t.integer "language" + t.integer "status" + t.integer "time_used", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "student_work_id", :default => 0 + end + create_table "comments", :force => true do |t| t.string "commented_type", :limit => 30, :default => "", :null => false t.integer "commented_id", :default => 0, :null => false @@ -1680,6 +1691,7 @@ ActiveRecord::Schema.define(:version => 20160427075457) do t.integer "status", :default => 9 t.text "results" t.text "src" + t.integer "uwait_time", :default => 0 end create_table "student_works", :force => true do |t| @@ -1698,8 +1710,8 @@ ActiveRecord::Schema.define(:version => 20160427075457) do t.integer "absence_penalty", :default => 0 t.float "system_score", :default => 0.0 t.boolean "is_test", :default => false - t.integer "simi_id" - t.integer "simi_value" + t.integer "simi_id", :default => 0 + t.integer "simi_value", :default => 0 t.float "work_score" end @@ -1933,25 +1945,6 @@ ActiveRecord::Schema.define(:version => 20160427075457) do add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" - create_table "user_wechats", :force => true do |t| - t.integer "subscribe" - t.string "openid" - t.string "nickname" - t.integer "sex" - t.string "language" - t.string "city" - t.string "province" - t.string "country" - t.string "headimgurl" - t.string "subscribe_time" - t.string "unionid" - t.string "remark" - t.integer "groupid" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "users", :force => true do |t| t.string "login", :default => "", :null => false t.string "hashed_password", :limit => 40, :default => "", :null => false @@ -2028,14 +2021,6 @@ ActiveRecord::Schema.define(:version => 20160427075457) do t.datetime "updated_at", :null => false end - create_table "wechat_logs", :force => true do |t| - t.string "openid", :null => false - t.text "request_raw" - t.text "response_raw" - t.text "session_raw" - t.datetime "created_at", :null => false - end - create_table "wiki_content_versions", :force => true do |t| t.integer "wiki_content_id", :null => false t.integer "page_id", :null => false