diff --git a/.idea/bigdate.iml b/.idea/bigdate.iml index 54164e1bd..def4eded2 100644 --- a/.idea/bigdate.iml +++ b/.idea/bigdate.iml @@ -13,46 +13,28 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + + + + @@ -77,28 +59,46 @@ - - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index df1bc8d15..4d7308362 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -134,7 +134,7 @@ class GamesController < ApplicationController game_challenge = @game.challenge gitUrl = git_repository_url(@myshixun, "Myshixun") gitUrl = Base64.encode64(gitUrl) - taskId = params[:id] + taskId = @game.id jobName = "myshixun_#{@myshixun.id}" ActiveRecord::Base.transaction do @game.update_attributes!(:status => 1) diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb index 723aa0038..bd6a1046e 100644 --- a/app/views/games/_file_edit_form.html.erb +++ b/app/views/games/_file_edit_form.html.erb @@ -2,7 +2,7 @@ .CodeMirror{line-height: 1.2; font-size: 14px} -
+
  • @@ -42,7 +42,7 @@ $("#save_status").html("保存中..."); $.ajax({ type: "POST", - url: '<%= file_update_myshixun_game_path(@myshixun.id, @game.id, :path => @path) %>', + url: '<%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %>', data:{ content: $('#challenge-answer-edit-small').val()}, success: function(data){ $("#save_status").html("已保存");