bug fix

jperm/ansible_api.py

@@ -363,7 +363,6 @@ class MyTask(MyRunner):
         self.run("user", module_args, become=True)
         return self.results
 
-
     @staticmethod
     def gen_sudo_script(role_list, sudo_list):
         # receive role_list = [role1, role2] sudo_list = [sudo1, sudo2]

jumpserver.conf

@@ -13,7 +13,7 @@ password = mysql234
 database = jumpserver
 
 [websocket]
-web_socket_host = 127.0.0.1:3000
+web_socket_host = j:3000
 
 [mail]
 mail_enable = 1

templates/jasset/asset_list.html

@@ -229,9 +229,10 @@
                 data: {},
                 success: function(data){
                     var dataArray = data.split(',');
-                    console.log(data+'a');
-                    console.log(dataArray);
-                    if (dataArray.length == 1 && data != 'error'){
+                    if (data == 'error' || data == '' || data == null || data == undefined){
+                        layer.alert('没有授权角色')
+                    }
+                    else if (dataArray.length == 1 && data != 'error'){
                         var title = 'Jumpserver Web Terminal' + '<span class="text-info"> '+ hostname +'</span>';
                         console.log(new_url+data);
                         layer.open({
@@ -242,9 +243,6 @@
                             area: ['628px', '452px'],
                             content: new_url+data
                         });
-                        //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 (data == 'error' || data == '' || data == null || data == undefined){
-                        layer.alert('没有授权角色')
                     } else {
                         aUrl = '';
                         $.each(dataArray, function(index, value){