From 1f36ec2636dee343d4998e96d9762f90c15c6b97 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 26 Mar 2017 11:39:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb |  2 ++
 app/views/games/_game_show.html.erb | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 1c1d2e5f1..be1f3935f 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -29,8 +29,10 @@ class GamesController < ApplicationController
       @path = game_path
       @file_open = true
       @content = @repository.cat(@path, @rev)
+      logger.info("content result is ###############{@content}")
     else
       @entries = @repository.entries(@path, @rev)
+      logger.info("result is ###############{@entries.first.try(:path)}")
     end
     @latest_output = @game.latest_output.try(:out_put)
     outputs = @game.outputs
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index fad345f34..aee02f30d 100644
--- a/app/views/games/_game_show.html.erb
+++ b/app/views/games/_game_show.html.erb
@@ -34,7 +34,7 @@
           <div class="tab-info-inner"><%= h @game.ready_knowledge.try(:html_safe) %></div>
         </div>
         <div id="tab_con_3" class="undis tab-info">
-          <div class="tab-info-inner" style="line-height: 1.9"><%= h @game.answer.html_safe %></div>
+          <div class="tab-info-inner" style="line-height: 1.9" id="myshixun_game_answer"><%= h @game.answer.html_safe %></div>
         </div>
       </div>
     </div>
@@ -47,6 +47,15 @@
   </div>
 </div>
 <script type="text/javascript" language="javascript">
+    var editor = CodeMirror.fromTextArea(document.getElementById("myshixun_game_answer"), {
+        mode: {name: 'text/x-java',
+            version: 2,
+            singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 2,
+        matchBrackets: true
+    });
+
     var web_h = window.innerHeight;
     $(document).ready(function(){
         if($.browser.msie) {

From 3bee690554510ec58d4e3444c0bd9a1dc50846ff Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 26 Mar 2017 13:26:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb   | 3 ++-
 app/controllers/shixuns_controller.rb | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index be1f3935f..1c709347e 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -20,6 +20,7 @@ class GamesController < ApplicationController
   # 首次进入版本库自动打开文件
   # path：""  && path: @game.path
   def show
+    logger.info("*** ###############")
     game_path = (@game.path.blank? ? @game.path : @game.path.strip)
     @rev = @rev.nil? ? "master" : @rev
     @git_url = git_repository_url(@myshixun, "Myshixun")
@@ -36,7 +37,7 @@ class GamesController < ApplicationController
     end
     @latest_output = @game.latest_output.try(:out_put)
     outputs = @game.outputs
-    @had_done = 1 if (@myshixun.games.count == @game.stage && @game.status ==2)
+    @had_done = 1 if (@mysh ixun.games.count == @game.stage && @game.status ==2)
     if outputs.count == 0
       @results = []
     else
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index e18fbae05..9c771598b 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -51,8 +51,7 @@ class ShixunsController < ApplicationController
         flash[:notice] = l(:notice_shixun_failed_exec)+ ":" + e.message
         raise ActiveRecord::Rollback
         respond_to do |format|
-          format.html{
-            redirect_to shixun_path(@shixun)}
+          format.html{redirect_to shixun_path(@shixun)}
         end
       end
     end

From e90a5d0a1a9f3f1dee45e4d24945043ebaee4701 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 26 Mar 2017 13:28:23 +0800
Subject: [PATCH 3/3] 0

---
 app/controllers/games_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 1c709347e..5c2c55765 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -37,7 +37,7 @@ class GamesController < ApplicationController
     end
     @latest_output = @game.latest_output.try(:out_put)
     outputs = @game.outputs
-    @had_done = 1 if (@mysh ixun.games.count == @game.stage && @game.status ==2)
+    @had_done = 1 if (@myshixun.games.count == @game.stage && @game.status ==2)
     if outputs.count == 0
       @results = []
     else