From 45bee06a9e97742f03f542bbf25c41f3dd2e3304 Mon Sep 17 00:00:00 2001
From: Firmlyzhu <firmlyzhu@163.com>
Date: Sun, 24 Mar 2019 17:48:39 +0800
Subject: [PATCH] Multilocation of batch

---
 web/templates/batch/batch_create.html | 1 +
 web/templates/batch/batch_list.html   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/templates/batch/batch_create.html b/web/templates/batch/batch_create.html
index be50d3b..5f77c87 100644
--- a/web/templates/batch/batch_create.html
+++ b/web/templates/batch/batch_create.html
@@ -147,6 +147,7 @@
 
     $("select#masterselector").change(function() {
       var masterip=$(this).children('option:selected').val();
+      $("#form").attr("action","/batch_job/"+ masterip +"/add/");
       var mastername=$(this).children('option:selected').html();
       console.log(masterip);
       var host = window.location.host;
diff --git a/web/templates/batch/batch_list.html b/web/templates/batch/batch_list.html
index eba03be..56ff385 100644
--- a/web/templates/batch/batch_list.html
+++ b/web/templates/batch/batch_list.html
@@ -33,7 +33,7 @@
 					 </p>
                  {% for master in masterips %}
                  {% for job_info in job_list[master.split('@')[0]] %}
-                 <div class="modal inmodal" id='OutputModal_{{ master }}_{{ job_info['job_id'] }}' tabindex="-1" role="dialog" aria-hidden="true">
+                 <div class="modal inmodal" id='OutputModal_{{ master.split('@')[1] }}_{{ job_info['job_id'] }}' tabindex="-1" role="dialog" aria-hidden="true">
                    <div class="modal-dialog">
                      <div class="modal-content animated fadeIn">
                        <div class="modal-header">
@@ -99,7 +99,7 @@
                             <td>Tasks</td>
 				            <td><a href="/batch_job/{{master.split("@")[0]}}/stop/{{ job_info['job_id'] }}/"><button type="button"  class="btn btn-xs btn-warning"> &nbsp;Stop&nbsp;&nbsp; </button></a></td>
                             <td>{{ job_info['create_time'] }}</td>
-                            <td><a role="button" class="btn btn-info btn-xs" id='{{ master }}_{{ job_info['job_id'] }}_output' data-toggle="modal" data-target='#OutputModal_{{ master }}_{{ job_info['job_id'] }}'>Get Output</a></td>
+                            <td><a role="button" class="btn btn-info btn-xs" id='{{ master }}_{{ job_info['job_id'] }}_output' data-toggle="modal" data-target='#OutputModal_{{ master.split('@')[1] }}_{{ job_info['job_id'] }}'>Get Output</a></td>
                         </tr>
                     {% endfor %}
                     {% endfor %}
@@ -118,7 +118,7 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
-   $(".table-batch").DataTable({"scrollX":true,"order":[[ 5, "desc" ]]});
+   $(".table-batch").DataTable({"scrollX":true,"order":[[ 6, "desc" ]]});
    $(".table-output").DataTable({
    "lengthChange":false});
 });