From 236da38444cb96f2fbc5cd79f3fbff5900c5e08a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 22 Sep 2017 19:41:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=8A=A0?= =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/commits.html.erb | 2 +- app/views/repositories/shixun_commit_diff.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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, From 0e253c4e9ff49390be670977e22ac6231493cc45 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 22 Sep 2017 20:05:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E5=BE=97=E5=88=86=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA100=E5=88=86=EF=BC=8C=E5=B9=B6=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E4=BB=A5=E5=BE=80=E5=88=86=E6=95=B0=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- ...0922114504_add_score_default_value_for_challenge.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170922114504_add_score_default_value_for_challenge.rb 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/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 From 6a142641b668046bdab13b676e449e7e14910bb1 Mon Sep 17 00:00:00 2001 From: XuCheng642 <287102909@qq.com> Date: Fri, 22 Sep 2017 20:24:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 4 ++-- app/views/managements/_leave_message_list.html.erb | 2 +- app/views/managements/_message_list.html.erb | 2 +- app/views/managements/_shixun_feedback_list.html.erb | 2 +- app/views/student_work/_shixun_work_show.html.erb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 8326deba5..89de0d47a 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/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) : '- -' %>