Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
This commit is contained in:
commit
5efb8c0004
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue