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 89de0d47a..32010e53f 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -1466,6 +1466,15 @@ end
shixun.update_column('status', 2)
apply_action.update_attributes(:status => 1, :dealer_id => User.current.id)
shixun_modify_status_without_publish shixun, 1
+ # 实训发布后则不允许修改代码
+ g = Gitlab.client
+ shixun.shixun_members.each do |member|
+ gid = User.find(member.user_id).try(:gid)
+ g.edit_team_member(shixun.gpid, gid, 10) # 3代表角色master
+ end
+ # 加入超级管理员
+ admin_gid = User.where(:admin => 1).first.try(:gid)
+ g.add_team_member(shixun.gpid, admin_gid, 40) # 30代表角色master
end
@authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => 0)
@authorizations_count = @authorizations.count
diff --git a/app/models/challenge.rb b/app/models/challenge.rb
index 1e389f070..980711d59 100644
--- a/app/models/challenge.rb
+++ b/app/models/challenge.rb
@@ -44,7 +44,7 @@ class Challenge < ActiveRecord::Base
def choose_score
score = 0
self.challenge_chooses.each do |choose|
- score += choose.score
+ score += choose.score.to_i
end
return score
end
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/db/migrate/20170922112450_sync_publish_game_for_gitlab.rb b/db/migrate/20170922112450_sync_publish_game_for_gitlab.rb
new file mode 100644
index 000000000..e91a6cd12
--- /dev/null
+++ b/db/migrate/20170922112450_sync_publish_game_for_gitlab.rb
@@ -0,0 +1,22 @@
+class SyncPublishGameForGitlab < ActiveRecord::Migration
+ def up
+ begin
+ g = Gitlab.client
+ shixuns = Shixun.where(:status => 2)
+ shixuns.each do |shixun|
+ shixun.shixun_members.each do |member|
+ gid = User.find(member.user_id).try(:gid)
+ g.edit_team_member(shixun.gpid, gid, 10) # 3代表角色master
+ end
+ # 加入超级管理员
+ admin_gid = User.where(:admin => 1).first.try(:gid)
+ g.add_team_member(shixun.gpid, admin_gid, 40) # 30代表角色master
+ end
+ rescue Exception => e
+ puts e.message
+ end
+ end
+
+ def down
+ end
+end
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
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index f7f4f00e3..e79899e4b 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -279,7 +279,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
.edu-pop-table tr td{border-bottom:1px solid #eee;}
.edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;}
.edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;}
-.edu-pop-table tr td .alink-name{color: #666666!important;}
+.edu-pop-table tr td .alink-name{color: #333!important;}
.edu-pop-table tr td .alink-name:hover{color: #FF7500!important;}
.edu-pop-table tr td .alink-operate{color: #cccccc!important;}
.edu-pop-table tr td .alink-operate:hover{color: #FF7500!important;}