You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/05/12 07:12:56 UTC

[15/28] kylin git commit: KYLIN-1600 Diagnosis UI for job status update

KYLIN-1600 Diagnosis UI for job status update


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a943113f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a943113f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a943113f

Branch: refs/heads/1.5.x-HBase1.x
Commit: a943113f6141e5af9b58502094749ac821976e17
Parents: ecc57ee
Author: Jason <ji...@163.com>
Authored: Tue May 10 14:32:43 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue May 10 14:32:43 2016 +0800

----------------------------------------------------------------------
 webapp/app/partials/jobs/jobList.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/a943113f/webapp/app/partials/jobs/jobList.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobList.html b/webapp/app/partials/jobs/jobList.html
index 8b122cc..98fb25d 100644
--- a/webapp/app/partials/jobs/jobList.html
+++ b/webapp/app/partials/jobs/jobList.html
@@ -124,8 +124,7 @@
           <td>{{ job.last_modified == 0 ? '' : (job.last_modified |utcToConfigTimeZone)}}</td>
           <td>{{(job.duration/60 | number:2) + ' mins'}}</td>
           <td>
-            <div class="btn-group"
-                 ng-if="job.job_status!='DISCARDED' && job.job_status!='FINISHED'">
+            <div class="btn-group">
               <button type="button" class="btn btn-default btn-xs dropdown-toggle"
                       data-toggle="dropdown">
                 Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
@@ -134,11 +133,12 @@
                 <li ng-if="job.job_status=='ERROR'"><a ng-click="resume(job)">Resume</a></li>
                 <li ng-if="job.job_status=='RUNNING' || job.job_status=='NEW' || job.job_status=='PENDING' || job.job_status=='ERROR'">
                   <a ng-click="cancel(job)">Discard</a>
+                </li>
+                <li>
                   <a ng-click="diagnosisJob(job)" tooltip="Download Diagnosis Info For This Job">Diagnosis</a>
                 </li>
               </ul>
             </div>
-            <span ng-if="job.job_status=='DISCARDED' || job.job_status=='FINISHED'">N/A</span>
           </td>
           <td>
             <button class="btn btn-info btn-xs" ng-click="state.showSteps= !state.showSteps; state.selectedJob = job">