From 04d2067b0e170614f99f58929f370d1564744063 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 15 Sep 2017 21:06:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index b3aff125b..1fb024611 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -692,7 +692,7 @@ update
     # 顶部导航
     @project_menu_type = 5
 
-    entry_and_raw(false)
+    # entry_and_raw(false)
     @content = @repository.cat(@path, @rev)
     # @changesets_latest_coimmit = @g.commit(@project.gpid, @entry.try(:lastrev))
     @changesets_latest_coimmit = @g.rep_last_changes(@shixun.gpid, :rev => @rev, :path => @path)
@@ -934,6 +934,7 @@ update
     end
   rescue ActiveRecord::RecordNotFound
     render_404
+    return
   rescue InvalidRevisionParam
     show_error_not_found
   end

From d03c4d568b28c1b142c3bf215e83de717af15778 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 15 Sep 2017 21:14:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E9=80=89=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 0c011a047..ee9696828 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -409,9 +409,10 @@ class GamesController < ApplicationController
       @answer = challenge.answer
     end
 
-    if challenge.shixun.status < 2 || @game.answer_open
+    if challenge.shixun.status < 2 || @game.answer_open || (challenge.st != 0 && @game.status == 2)
       @viewed = 1
     else
+      @game.update_attributes(:answer_open => true) unless @game.answer_open
       if @score >= 0
         @viewed = 2
       else