From e873be95d54d5517c21a59ec4f0bdcd6dd90af2b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 26 Mar 2018 16:16:18 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=AF=BC=E5=85=A5=E5=88=B0=E5=BD=93?=
 =?UTF-8?q?=E5=89=8Dnode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 8 ++++++++
 apps/assets/views/asset.py                   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 3841b34bb..ec905b119 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -451,6 +451,14 @@ $(document).ready(function(){
 })
 .on('click', '#btn_asset_import', function () {
     var $form = $('#fm_asset_import');
+    var action = $form.attr("action");
+    var nodes = zTree.getSelectedNodes();
+    var current_node;
+    if (nodes && nodes.length ===1 ){
+        current_node = nodes[0];
+        action += "?node_id=" + current_node.id;
+        $form.attr("action", action)
+    }
     $form.find('.help-block').remove();
     function success (data) {
         if (data.valid === false) {
diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py
index c3fbd4758..e279bc0ec 100644
--- a/apps/assets/views/asset.py
+++ b/apps/assets/views/asset.py
@@ -245,6 +245,8 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
     form_class = forms.FileForm
 
     def form_valid(self, form):
+        node_id = self.request.GET.get("node_id")
+        node = get_object_or_none(Node, id=node_id) if node_id else Node.root()
         f = form.cleaned_data['file']
         det_result = chardet.detect(f.read())
         f.seek(0)  # reset file seek index
@@ -297,6 +299,8 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
                         raise Exception(_('already exists'))
                     with transaction.atomic():
                         asset = Asset.objects.create(**asset_dict)
+                        if node:
+                            asset.nodes.set([node])
                         created.append(asset_dict['hostname'])
                         assets.append(asset)
                 except Exception as e: