Merge branch 'master' into guardian
# Conflicts: # Pipfile # Pipfile.lock # passbook/admin/views/invitations.py # passbook/admin/views/policy.py # passbook/admin/views/providers.py # passbook/admin/views/sources.py # passbook/admin/views/users.py
This commit is contained in:
		@ -20,6 +20,7 @@ class ApplicationListView(LoginRequiredMixin, PermissionListMixin, ListView):
 | 
			
		||||
    model = Application
 | 
			
		||||
    permission_required = 'passbook_core.view_application'
 | 
			
		||||
    ordering = 'name'
 | 
			
		||||
    paginate_by = 40
 | 
			
		||||
    template_name = 'administration/application/list.html'
 | 
			
		||||
 | 
			
		||||
    def get_queryset(self):
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user