mirror of
				https://github.com/netbox-community/netbox.git
				synced 2024-05-10 07:54:54 +00:00 
			
		
		
		
	Merge branch 'develop' into feature
This commit is contained in:
		@@ -195,6 +195,8 @@ class ContactGroupView(generic.ObjectView):
 | 
			
		||||
 | 
			
		||||
        contacts = Contact.objects.restrict(request.user, 'view').filter(
 | 
			
		||||
            group=instance
 | 
			
		||||
        ).annotate(
 | 
			
		||||
            assignment_count=count_related(ContactAssignment, 'contact')
 | 
			
		||||
        )
 | 
			
		||||
        contacts_table = tables.ContactTable(contacts, user=request.user, exclude=('group',))
 | 
			
		||||
        contacts_table.configure(request)
 | 
			
		||||
@@ -353,14 +355,18 @@ class ContactBulkImportView(generic.BulkImportView):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ContactBulkEditView(generic.BulkEditView):
 | 
			
		||||
    queryset = Contact.objects.all()
 | 
			
		||||
    queryset = Contact.objects.annotate(
 | 
			
		||||
        assignment_count=count_related(ContactAssignment, 'contact')
 | 
			
		||||
    )
 | 
			
		||||
    filterset = filtersets.ContactFilterSet
 | 
			
		||||
    table = tables.ContactTable
 | 
			
		||||
    form = forms.ContactBulkEditForm
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ContactBulkDeleteView(generic.BulkDeleteView):
 | 
			
		||||
    queryset = Contact.objects.all()
 | 
			
		||||
    queryset = Contact.objects.annotate(
 | 
			
		||||
        assignment_count=count_related(ContactAssignment, 'contact')
 | 
			
		||||
    )
 | 
			
		||||
    filterset = filtersets.ContactFilterSet
 | 
			
		||||
    table = tables.ContactTable
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user