diff --git a/Gemfile b/Gemfile
index d29d5c856..2a11f7477 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ unless RUBY_PLATFORM =~ /w32/
gem 'nokogiri'
end
-gem 'simple_xlsx_reader'
+#gem 'simple_xlsx_reader'
gem 'wechat',path: 'lib/wechat'
gem 'grack', path:'lib/grack'
gem 'gitlab', path: 'lib/gitlab-cli'
diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index fce054ce8..32010e53f 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -226,7 +226,7 @@ class ManagementsController < ApplicationController
def leave_message
@menu_type = 8
@sub_type = 1
- @jour = JournalsForMessage.where(:jour_type => 'HomeworkCommon')
+ @jour = JournalsForMessage.where(:jour_type => 'HomeworkCommon').order("created_on desc")
@jour_count = @jour.count
limit = 20
@is_remote = true
@@ -243,7 +243,7 @@ class ManagementsController < ApplicationController
def messages_list
@menu_type = 8
@sub_type = 3
- @memo = Memo.where("0=0")
+ @memo = Memo.where("0=0").order("created_at desc")
@memo_count = @memo.count
limit = 20
@is_remote = true
diff --git a/app/views/managements/_leave_message_list.html.erb b/app/views/managements/_leave_message_list.html.erb
index c57ece754..f65fbf4c8 100644
--- a/app/views/managements/_leave_message_list.html.erb
+++ b/app/views/managements/_leave_message_list.html.erb
@@ -4,7 +4,7 @@
序号 |
来源(课程或用户ID) |
留言人 |
- 留言时间 |
+ 留言时间 |
留言内容 |
回复数 |
diff --git a/app/views/managements/_message_list.html.erb b/app/views/managements/_message_list.html.erb
index 58b0587ad..48696e67e 100644
--- a/app/views/managements/_message_list.html.erb
+++ b/app/views/managements/_message_list.html.erb
@@ -4,7 +4,7 @@
序号 |
来源(贴吧ID) |
作者 |
- 时间 |
+ 时间 |
标题 |
回复数 |
diff --git a/app/views/managements/_shixun_feedback_list.html.erb b/app/views/managements/_shixun_feedback_list.html.erb
index f531178ac..b53e234d7 100644
--- a/app/views/managements/_shixun_feedback_list.html.erb
+++ b/app/views/managements/_shixun_feedback_list.html.erb
@@ -4,7 +4,7 @@
实训名称 |
评论内容 |
评论者 |
- 评论时间 |
+ 评论时间 |
|
diff --git a/app/views/repositories/commits.html.erb b/app/views/repositories/commits.html.erb
index 0103552db..12d5d21ed 100644
--- a/app/views/repositories/commits.html.erb
+++ b/app/views/repositories/commits.html.erb
@@ -1,4 +1,4 @@
-
+
<%= render :partial => 'shixun_navigation' %>
diff --git a/app/views/repositories/shixun_commit_diff.html.erb b/app/views/repositories/shixun_commit_diff.html.erb
index 9e87166c6..12844f067 100644
--- a/app/views/repositories/shixun_commit_diff.html.erb
+++ b/app/views/repositories/shixun_commit_diff.html.erb
@@ -1,4 +1,4 @@
-
+
<%=link_to "
返回提交历史".html_safe,
diff --git a/app/views/student_work/_shixun_work_show.html.erb b/app/views/student_work/_shixun_work_show.html.erb
index c61e5ed7a..ebec25778 100644
--- a/app/views/student_work/_shixun_work_show.html.erb
+++ b/app/views/student_work/_shixun_work_show.html.erb
@@ -23,7 +23,7 @@
- 通关情况:<%= had_passed_changllenge_num(@shixun, @work.user).to_s+" / "+@shixun.challenges.count.to_s %>
- - 总耗时:<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %>
+ - 总耗时:<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %>
diff --git a/db/migrate/20170922114504_add_score_default_value_for_challenge.rb b/db/migrate/20170922114504_add_score_default_value_for_challenge.rb
new file mode 100644
index 000000000..bb3494e2d
--- /dev/null
+++ b/db/migrate/20170922114504_add_score_default_value_for_challenge.rb
@@ -0,0 +1,10 @@
+class AddScoreDefaultValueForChallenge < ActiveRecord::Migration
+ def up
+ challenges = Challenge.where(:score => nil)
+ challenges.update_all(:score => 100)
+ change_column :challenges, :score, :integer, :default => 100
+ end
+
+ def down
+ end
+end