1.修复运行模块选择ping之后自定义模块无法隐藏的bug

2.优化上传脚本，剧本需要手动创建目录，改为自动判断
welliamcao · Dec 21, 2017 · 20dbaed · 20dbaed
1 parent ef88239
commit 20dbaed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/OpsManage/templates/apps/apps_model.html b/OpsManage/templates/apps/apps_model.html
@@ -197,6 +197,10 @@ <h1 class="page-header"><i class="fa fa-gears"></i><code>Ansible</code>模块管
 		   document.getElementById("custom_model").style.display = "";  
 		   document.getElementById("ansible_args").value="";
 	   }
+	   else if(value=="ping"){
+		   document.getElementById("custom_model").style.display = "none";  
+		   document.getElementById("ansible_args").value="";
+	   }	   
 	   else {
 		   document.getElementById("ansible_args").value="";	 
 	   }

diff --git a/OpsManage/views/ansible.py b/OpsManage/views/ansible.py
@@ -162,6 +162,7 @@ def apps_online(request):
             fileName = '/upload/playbook/online-{ram}.yaml'.format(ram=uuid.uuid4().hex[0:8]) 
             filePath = os.getcwd() + fileName
             if request.POST.get('playbook_content'):
+                if os.path.isdir(os.path.dirname(filePath)) is not True:os.makedirs(os.path.dirname(filePath))#判断文件存放的目录是否存在，不存在就创建
                 with open(filePath, 'w') as f:
                     f.write(request.POST.get('playbook_content')) 
             else:
@@ -508,6 +509,7 @@ def apps_script_online(request):
         resource = []
         sList = []
         def saveScript(content,filePath):
+            if os.path.isdir(os.path.dirname(filePath)) is not True:os.makedirs(os.path.dirname(filePath))#判断文件存放的目录是否存在，不存在就创建
             with open(filePath, 'w') as f:
                 f.write(content) 
             return filePath
@@ -622,6 +624,7 @@ def apps_script_online_run(request,pid):
                                                          "errorInfo":"剧本不存在，可能已经被删除."}, 
                                   ) 
     def saveScript(content,filePath):
+        if os.path.isdir(os.path.dirname(filePath)) is not True:os.makedirs(os.path.dirname(filePath))#判断文件存放的目录是否存在，不存在就创建
         with open(filePath, 'w') as f:
             f.write(content) 
         return filePath