mirror of https://github.com/jumpserver/jumpserver
				
				
				
			[Update] 修改一些bug
							parent
							
								
									0a9af98729
								
							
						
					
					
						commit
						8e74a04282
					
				| 
						 | 
				
			
			@ -58,6 +58,9 @@ class SystemUserPushApi(generics.RetrieveAPIView):
 | 
			
		|||
 | 
			
		||||
    def retrieve(self, request, *args, **kwargs):
 | 
			
		||||
        system_user = self.get_object()
 | 
			
		||||
        nodes = system_user.nodes.all()
 | 
			
		||||
        for node in nodes:
 | 
			
		||||
            system_user.assets.add(*tuple(node.get_all_assets()))
 | 
			
		||||
        task = push_system_user_to_assets_manual.delay(system_user)
 | 
			
		||||
        return Response({"task": task.id})
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -104,6 +104,11 @@ class AssetUser(models.Model):
 | 
			
		|||
        if update_fields:
 | 
			
		||||
            self.save(update_fields=update_fields)
 | 
			
		||||
 | 
			
		||||
    def clear_auth(self):
 | 
			
		||||
        self._password = ''
 | 
			
		||||
        self._private_key = ''
 | 
			
		||||
        self.save()
 | 
			
		||||
 | 
			
		||||
    def auto_gen_auth(self):
 | 
			
		||||
        password = str(uuid.uuid4())
 | 
			
		||||
        private_key, public_key = ssh_key_gen(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -96,14 +96,7 @@ class LDAPTestingAPI(APIView):
 | 
			
		|||
 | 
			
		||||
class DjangoSettingsAPI(APIView):
 | 
			
		||||
    def get(self, request):
 | 
			
		||||
        if not settings.DEBUG:
 | 
			
		||||
            return Response('Only debug mode support')
 | 
			
		||||
 | 
			
		||||
        configs = {}
 | 
			
		||||
        for i in dir(settings):
 | 
			
		||||
            if i.isupper():
 | 
			
		||||
                configs[i] = str(getattr(settings, i))
 | 
			
		||||
        return Response(configs)
 | 
			
		||||
        return Response('Danger, Close now')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -250,7 +250,7 @@ function initTree() {
 | 
			
		|||
        {#$.fn.zTree.init($("#assetTree"), setting);#}
 | 
			
		||||
        $.fn.zTree.init($("#assetTree"), setting, zNodes);
 | 
			
		||||
        zTree = $.fn.zTree.getZTreeObj("assetTree");
 | 
			
		||||
        selectQueryNode();
 | 
			
		||||
        {#selectQueryNode();#}
 | 
			
		||||
    });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue