[drill] branch master updated: DRILL-6886: Cancel Query Button for running queries

[ku...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kunal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 31ba50f  DRILL-6886: Cancel Query Button for running queries
31ba50f is described below

commit 31ba50fe332df04f38d16906d0be2a69790a342f
Author: Kunal Khatua <kk...@users.noreply.github.com>
AuthorDate: Sun Dec 9 22:40:19 2018 -0800

    DRILL-6886: Cancel Query Button for running queries
    
    The Freemarker template missed a check for a query's Running state to display the [Cancel] button.
    
    The fix is trivial and only needs the check.
---
 exec/java-exec/src/main/resources/rest/profile/profile.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
index 8350a10..59f8485 100644
--- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
@@ -189,7 +189,7 @@ table.sortable thead .sorting_desc { background-image: url("/static/img/black-de
 
   <div class="page-header"></div>
   <h3>Query Profile: <span style='font-size:85%'>${model.getQueryId()}</span>
-  <#if model.getQueryStateDisplayName() == "Prepared" || model.getQueryStateDisplayName() == "Planning" || model.getQueryStateDisplayName() == "Enqueued" || model.getQueryStateDisplayName() == "Starting">
+  <#if model.getQueryStateDisplayName() == "Prepared" || model.getQueryStateDisplayName() == "Planning" || model.getQueryStateDisplayName() == "Enqueued" || model.getQueryStateDisplayName() == "Starting" || model.getQueryStateDisplayName() == "Running">
     <div  style="display: inline-block;">
       <button type="button" id="cancelBtn" class="btn btn-warning btn-sm" onclick="cancelQuery()" > Cancel </button>
     </div>