habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into guardian

Browse Source 
# 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:
Langhammer, Jens
2019-10-15 15:09:11 +02:00
parent 37111fd07b 4086252979
commit 261d57ad7b
487 changed files with 75905 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
passbook/admin/views/users.py
View File

@ -20,6 +20,8 @@ class UserListView(LoginRequiredMixin, PermissionListMixin, ListView):
model = User
permission_required = 'passbook_core.view_user'
ordering = 'username'
paginate_by = 40
template_name = 'administration/user/list.html'
@ -49,6 +51,8 @@ class UserUpdateView(SuccessMessageMixin, LoginRequiredMixin,
form_class = UserForm
permission_required = 'passbook_core.change_user'
context_object_name = 'object' # By default the object's name
# is user which is used by other checks
template_name = 'generic/update.html'
success_url = reverse_lazy('passbook_admin:users')
success_message = _('Successfully updated User')