forked from rc/aircox
		
	fix conflict issue
This commit is contained in:
		@ -38,7 +38,7 @@ class Actions:
 | 
			
		||||
 | 
			
		||||
        Return the number of conflicts
 | 
			
		||||
        """
 | 
			
		||||
        conflicts = item.get_conflicts()
 | 
			
		||||
        conflicts = list(item.get_conflicts())
 | 
			
		||||
        for i, conflict in enumerate(conflicts):
 | 
			
		||||
            if conflict.program == item.program:
 | 
			
		||||
                item.do_not_save = True
 | 
			
		||||
@ -74,6 +74,7 @@ class Actions:
 | 
			
		||||
            if manual:
 | 
			
		||||
                Diffusion.objects.bulk_create(items)
 | 
			
		||||
            else:
 | 
			
		||||
                print('items: ', len(items))
 | 
			
		||||
                for item in items:
 | 
			
		||||
                    count[1] += cl.__check_conflicts(item, saved_items)
 | 
			
		||||
                    if hasattr(item, 'do_not_save'):
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user