huge fix
This commit is contained in:
		
							parent
							
								
									810c87e2e0
								
							
						
					
					
						commit
						b5bf3a5dbe
					
				
					 51 changed files with 2397 additions and 326 deletions
				
			
		| 
						 | 
				
			
			@ -20,7 +20,7 @@ def scope_instances_queryset(user, queryset=None):
 | 
			
		|||
            return qs.filter(id__in=assign_ids)
 | 
			
		||||
        if profile.has_role(UserRoles.BROKER):
 | 
			
		||||
            return qs.filter(broker=profile.broker)
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER):
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
 | 
			
		||||
            return qs.filter(broker__affairs__county=profile.county)
 | 
			
		||||
        if profile.has_role(UserRoles.ADMIN):
 | 
			
		||||
            return qs
 | 
			
		||||
| 
						 | 
				
			
			@ -69,7 +69,7 @@ def scope_wells_queryset(user, queryset=None):
 | 
			
		|||
            return qs
 | 
			
		||||
        if profile.has_role(UserRoles.BROKER):
 | 
			
		||||
            return qs.filter(broker=profile.broker)
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER):
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
 | 
			
		||||
            return qs.filter(broker__affairs__county=profile.county)
 | 
			
		||||
        if profile.has_role(UserRoles.INSTALLER):
 | 
			
		||||
            # Wells that have instances assigned to this installer
 | 
			
		||||
| 
						 | 
				
			
			@ -102,7 +102,7 @@ def scope_customers_queryset(user, queryset=None):
 | 
			
		|||
            return qs
 | 
			
		||||
        if profile.has_role(UserRoles.BROKER):
 | 
			
		||||
            return qs.filter(broker=profile.broker)
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER):
 | 
			
		||||
        if profile.has_role(UserRoles.ACCOUNTANT) or profile.has_role(UserRoles.MANAGER) or profile.has_role(UserRoles.WATER_RESOURCE_MANAGER):
 | 
			
		||||
            return qs.filter(county=profile.county)
 | 
			
		||||
        if profile.has_role(UserRoles.INSTALLER):
 | 
			
		||||
            # Customers that are representatives of instances assigned to this installer
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue