From 255e3a043ad232c9f98fbc887d2712149d948121 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 3 Dec 2015 10:38:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/views.py              | 1 +
 templates/exec_cmd.html          | 4 ++--
 templates/jasset/asset_list.html | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jumpserver/views.py b/jumpserver/views.py
index 82bef8436..900d39fc8 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -363,5 +363,6 @@ def download(request):
 @login_required(login_url='/login')
 def exec_cmd(request):
     role = request.GET.get('role')
+    check_assets = request.GET.get('check_assets', '')
     web_terminal_uri = 'ws://%s/exec?role=%s' % (WEB_SOCKET_HOST, role)
     return my_render('exec_cmd.html', locals(), request)
diff --git a/templates/exec_cmd.html b/templates/exec_cmd.html
index 76c19c214..cfadcfa58 100644
--- a/templates/exec_cmd.html
+++ b/templates/exec_cmd.html
@@ -14,7 +14,7 @@
 
         <div id="footer">
           <div class="content">
-            <input type="text" id="pattern" placeholder="Ansible Pattern">
+            <input type="text" id="pattern" value="{{ check_assets }}" placeholder="Ansible Pattern">
             <input type="text" id="command" placeholder="Command to execute">
             <input type="button" id="send_btn" value="Send" onclick="sendMessage()">
           </div>
@@ -119,7 +119,7 @@
     position: relative;
   }
 
-  #pattern { width: 20%; }
+  #pattern { width: 25%; }
   #command { width: 60%; }
   #send_btn {
     width: 10%;
diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html
index fd3012b41..d3ab28d70 100644
--- a/templates/jasset/asset_list.html
+++ b/templates/jasset/asset_list.html
@@ -176,6 +176,11 @@
         $('#exec_cmd').click(function(){
             var url = '/jperm/role/get/';
             var new_url = '/exec_cmd/?role=';
+            var check_array = [];
+            $(".gradeX input:checked").closest('tr').find('.hostname a').each(function() {
+                check_array.push($(this).text())
+            });
+            check_assets = check_array.join(':');
             $.ajax({
                 type: 'GET',
                 url: url,
@@ -190,7 +195,7 @@
                             maxmin: true,
                             shade: false,
                             area: ['800px', '700px'],
-                            content: new_url+data
+                            content: new_url+data+'&check_assets='+check_assets
                         });
                         //window.open(new_url + data, '', 'location=no, resizeable=no, height=410, width=625, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,status=no');
                     } else if (dataArray.length == '1' && data == 'error'){
@@ -198,7 +203,7 @@
                     } else {
                         aUrl = '';
                         $.each(dataArray, function(index, value){
-                            aUrl += '<a onclick="windowOpenExec(this); return false" class="btn btn-xs btn-primary newa" href=' + new_url + value + '>' + value  + '</a> '
+                            aUrl += '<a onclick="windowOpenExec(this); return false" class="btn btn-xs btn-primary newa" href=' + new_url + value  + '&check_assets=' + check_assets + '>' + value  + '</a> '
                         });
                         layer.alert(aUrl, {
                             skin: 'layui-layer-molv',