Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
cxt 2017-04-01 10:59:59 +08:00
commit 5efb8c0004
1 changed files with 6 additions and 0 deletions

View File

@ -28,6 +28,7 @@ class GamesController < ApplicationController
@rev = @rev.nil? ? "master" : @rev
@git_url = git_repository_url(@myshixun, "Myshixun")
@type = params[:type]
logger.info("##########************languae is #{@language}")
# 默认打开文件
if @path == "" && !game_path.nil? && !@repository.cat(game_path, @rev).blank? && @type != "root"
@path = game_path
@ -45,6 +46,11 @@ class GamesController < ApplicationController
else
@results = outputs.map{|result| [result.code, result.id]}
end
logger.info("##################languae is #{@language}")
logger.info("##################latest_output is #{@latest_output}")
logger.info("##################had_done is #{@had_done}")
logger.info("##################status is #{@game.status}")
logger.info("##################result is #{@results}")
respond_to do |format|
format.html
format.js