@@ -46,7 +47,7 @@
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
- <% if @project.is_child_training_project? %>
+ <% if project.is_child_training_project? %>
<%= render :partial => "training_tasks/action_status", :locals => {:activity => activity} %>
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 7a2689759..534cde37d 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -42,7 +42,9 @@
<%= render :partial => 'projects/act_issues', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
<% when "TrainingTask" %>
<% if User.current.admin? || is_project_manager?(User.current.id, @project.id) || is_project_manager?(User.current, @project.try(:forked_from_project_id)) %>
- <%= render :partial => 'projects/act_training_tasks', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
+
+ <%= render :partial => 'projects/act_training_tasks', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
+
<% end %>
<% when "Message" %>
diff --git a/app/views/projects/task_execute.js.erb b/app/views/projects/task_execute.js.erb
index e6528db39..114ab6960 100644
--- a/app/views/projects/task_execute.js.erb
+++ b/app/views/projects/task_execute.js.erb
@@ -1,2 +1,3 @@
$("#training_project_task_status_<%= @training_task.id %>").html('<%= escape_javascript( render :partial => 'training_tasks/action_status', :locals => {:activity => @training_task}) %>');
-$("#training_task_details").html('<%= escape_javascript( render :partial => 'training_tasks/training_task_details', :locals => {:activity => @training_task, :project_id => @project.id}) %>');
\ No newline at end of file
+$("#training_task_details").html('<%= escape_javascript( render :partial => 'training_tasks/training_task_details', :locals => {:activity => @training_task, :project_id => @project.id}) %>');
+$("#project_show_training_task_<%= @training_task.project_id %>").html('<%= escape_javascript( render :partial => 'projects/act_training_tasks', :locals => {:activity => @training_task, :user_activity_id => @training_task.id, :project_id => @training_task.project_id}) %>');
\ No newline at end of file
diff --git a/app/views/training_tasks/_action_status.html.erb b/app/views/training_tasks/_action_status.html.erb
index ed5a48dca..0f813b69f 100644
--- a/app/views/training_tasks/_action_status.html.erb
+++ b/app/views/training_tasks/_action_status.html.erb
@@ -6,11 +6,19 @@
当前任务正在后台测评中,稍后将显示您的任务完成情况......
<% else %>
<% if User.current.member_of?(@project) && @project.is_child_training_project? %>
- <%= link_to "提交评测", task_execute_project_path(@project, :training_task_id => activity.id), :class => "task-display-span bBlue mt10", :remote => true %>
+
+ <%= link_to "提交评测", task_execute_project_path(@project, :training_task_id => activity.id), :class => "task-display-span bBlue mt10", :onclick => "training_task_submmit();", :remote => true %>
+
<% end %>
<% end %>