From cfd216175600bb016b52d05ec58203fa52114644 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 28 Feb 2017 21:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8sleep=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb    | 13 ++++++++-----
 app/views/training_tasks/_detail.html.erb |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fe6428cc5..b6ccc13b7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -895,8 +895,7 @@ class ProjectsController < ApplicationController
     gitlab_address = Redmine::Configuration['gitlab_address']
     gitUrl = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ rep_identify + "."+"git"
     gitUrl = Base64.encode64(gitUrl)
-    @page = params[:page] ? params[:page].to_i + 1 : 0
-    @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'TrainingTask','Message','News', 'Project', 'Attachment','Commit')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
+
     if @training_task.status == 0
       params = {:jobName => "#{jobName}", :taskId => "#{taskId}", :step => "#{step}",  :gitUrl => "#{gitUrl}"}
       uri = URI.parse("http://123.59.135.74:9999/jenkins-exec/api/buildJob")
@@ -905,8 +904,8 @@ class ProjectsController < ApplicationController
         # 任务开启成功后创建一条留言提示，并发布
         # @training_task.update_attribute(:status, 2)
         # 轮询获取
-        for i in 0..10 do
-          sleep(10)
+        for i in 0..30 do
+          sleep(2)
           status = TrainingTask.where(:id => @training_task.id).first.try(:status)
           if (status == 1 || status == 0)
             @training_task.status = status
@@ -917,11 +916,15 @@ class ProjectsController < ApplicationController
           end
         end
 
-        return
+        @page = params[:page] ? params[:page].to_i + 1 : 0
+        @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'TrainingTask','Message','News', 'Project', 'Attachment','Commit')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
       rescue Exception => e
         puts e
       end
     end
+    respond_to do |format|
+      format.js
+    end
   end
 
   def uri_exec uri, params
diff --git a/app/views/training_tasks/_detail.html.erb b/app/views/training_tasks/_detail.html.erb
index ef41e3965..fa7913404 100644
--- a/app/views/training_tasks/_detail.html.erb
+++ b/app/views/training_tasks/_detail.html.erb
@@ -32,7 +32,7 @@
     <%= render :partial => 'task_attachments', :locals => {:training_task => @training_task} %>
   </div>
   <div class="cl"></div>
- 
+
 </div>
 
 <script type="text/javascript">