matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #56, Start addressing issue #40 (document, permissions, sources, tags and user_management apps)

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-02 02:25:28 -04:00
parent 691bbdc18e
commit c664dd7113
5 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mayan/apps/documents/views.py
View File

@@ -180,15 +180,15 @@ def document_delete(request, document_id=None, document_id_list=None):
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one document.')) messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try: try:
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_DELETE]) Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_DELETE])
except PermissionDenied: except PermissionDenied:
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_DOCUMENT_DELETE, request.user, documents, exception_on_empty=True) documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_DOCUMENT_DELETE, request.user, documents, exception_on_empty=True)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
for document in documents: for document in documents:
@@ -290,7 +290,7 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE):
def document_download(request, document_id=None, document_id_list=None, document_version_pk=None): def document_download(request, document_id=None, document_id_list=None, document_version_pk=None):
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if document_id: if document_id:
document_versions = [get_object_or_404(Document, pk=document_id).latest_version] document_versions = [get_object_or_404(Document, pk=document_id).latest_version]
@@ -456,7 +456,7 @@ def document_update_page_count(request):
office_converter = OfficeConverter() office_converter = OfficeConverter()
qs = DocumentVersion.objects.exclude(filename__iendswith='dxf').filter(mimetype__in=office_converter.mimetypes()) qs = DocumentVersion.objects.exclude(filename__iendswith='dxf').filter(mimetype__in=office_converter.mimetypes())
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
updated = 0 updated = 0
@@ -491,7 +491,7 @@ def document_clear_transformations(request, document_id=None, document_id_list=N
post_redirect = None post_redirect = None
else: else:
messages.error(request, _(u'Must provide at least one document.')) messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', u'/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try: try:
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TRANSFORM]) Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TRANSFORM])
@@ -655,11 +655,11 @@ def document_page_navigation_next(request, document_page_id):
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
if document_page.page_number >= document_page.siblings.count(): if document_page.page_number >= document_page.siblings.count():
messages.warning(request, _(u'There are no more pages in this document')) messages.warning(request, _(u'There are no more pages in this document'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', u'/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
else: else:
document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number + 1) document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number + 1)
return HttpResponseRedirect(reverse(view, args=[document_page.pk])) return HttpResponseRedirect(reverse(view, args=[document_page.pk]))
@@ -673,11 +673,11 @@ def document_page_navigation_previous(request, document_page_id):
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
if document_page.page_number <= 1: if document_page.page_number <= 1:
messages.warning(request, _(u'You are already at the first page of this document')) messages.warning(request, _(u'You are already at the first page of this document'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', u'/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
else: else:
document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number - 1) document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number - 1)
return HttpResponseRedirect(reverse(view, args=[document_page.pk])) return HttpResponseRedirect(reverse(view, args=[document_page.pk]))
@@ -692,7 +692,7 @@ def document_page_navigation_first(request, document_page_id):
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
return HttpResponseRedirect(reverse(view, args=[document_page.pk])) return HttpResponseRedirect(reverse(view, args=[document_page.pk]))
@@ -706,7 +706,7 @@ def document_page_navigation_last(request, document_page_id):
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
return HttpResponseRedirect(reverse(view, args=[document_page.pk])) return HttpResponseRedirect(reverse(view, args=[document_page.pk]))
@@ -730,10 +730,10 @@ def transform_page(request, document_page_id, zoom_function=None, rotation_funct
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
# Get the query string from the referer url # Get the query string from the referer url
query = urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).query query = urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).query
# Parse the query string and get the zoom value # Parse the query string and get the zoom value
# parse_qs return a dictionary whose values are lists # parse_qs return a dictionary whose values are lists
zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0]) zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0])
@@ -917,8 +917,8 @@ def document_type_delete(request, document_type_id):
post_action_redirect = reverse('documents:document_type_list') post_action_redirect = reverse('documents:document_type_list')
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
try: try:
@@ -1036,8 +1036,8 @@ def document_type_filename_delete(request, document_type_filename_id):
post_action_redirect = reverse('documents:document_type_filename_list', args=[document_type_filename.document_type_id]) post_action_redirect = reverse('documents:document_type_filename_list', args=[document_type_filename.document_type_id])
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
try: try:
@@ -1107,7 +1107,7 @@ def document_type_filename_create(request, document_type_id):
def document_clear_image_cache(request): def document_clear_image_cache(request):
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TOOLS]) Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TOOLS])
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
try: try:
@@ -1181,7 +1181,7 @@ def document_version_revert(request, document_version_pk):
except PermissionDenied: except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VERSION_REVERT, request.user, document_version.document) AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VERSION_REVERT, request.user, document_version.document)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
try: try:

5
mayan/apps/permissions/views.py
View File

@@ -8,6 +8,7 @@ from django.contrib import messages
from django.contrib.auth.models import Group, User from django.contrib.auth.models import Group, User
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
from django.conf import settings
from django.http import Http404, HttpResponseRedirect from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render_to_response from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext from django.template import RequestContext
@@ -111,8 +112,8 @@ def permission_grant(request):
items_property_list = loads(request.GET.get('items_property_list', [])) items_property_list = loads(request.GET.get('items_property_list', []))
post_action_redirect = None post_action_redirect = None
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
items = [] items = []
for item_properties in items_property_list: for item_properties in items_property_list:

7
mayan/apps/sources/views.py
View File

@@ -4,6 +4,7 @@ from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404 from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext from django.template import RequestContext
@@ -376,8 +377,8 @@ def staging_file_delete(request, staging_folder_pk, encoded_filename):
staging_folder = get_object_or_404(StagingFolder, pk=staging_folder_pk) staging_folder = get_object_or_404(StagingFolder, pk=staging_folder_pk)
staging_file = staging_folder.get_file(encoded_filename=encoded_filename) staging_file = staging_folder.get_file(encoded_filename=encoded_filename)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
try: try:
@@ -437,7 +438,7 @@ def setup_source_edit(request, source_type, source_id):
form_class = WatchFolderSetupForm form_class = WatchFolderSetupForm
source = get_object_or_404(cls, pk=source_id) source = get_object_or_404(cls, pk=source_id)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
form = form_class(instance=source, data=request.POST) form = form_class(instance=source, data=request.POST)

19
mayan/apps/tags/views.py
View File

@@ -5,6 +5,7 @@ import logging
from django.contrib import messages from django.contrib import messages
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404 from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext from django.template import RequestContext
@@ -67,7 +68,7 @@ def tag_attach(request, document_id=None, document_id_list=None):
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one document.')) messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try: try:
Permission.objects.check_permissions(request.user, [PERMISSION_TAG_ATTACH]) Permission.objects.check_permissions(request.user, [PERMISSION_TAG_ATTACH])
@@ -75,8 +76,8 @@ def tag_attach(request, document_id=None, document_id_list=None):
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_TAG_ATTACH, request.user, documents) documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_TAG_ATTACH, request.user, documents)
post_action_redirect = None post_action_redirect = None
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
form = TagListForm(request.POST, user=request.user) form = TagListForm(request.POST, user=request.user)
@@ -152,15 +153,15 @@ def tag_delete(request, tag_id=None, tag_id_list=None):
tags = [get_object_or_404(Tag, pk=tag_id) for tag_id in tag_id_list.split(',')] tags = [get_object_or_404(Tag, pk=tag_id) for tag_id in tag_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one tag.')) messages.error(request, _(u'Must provide at least one tag.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try: try:
Permission.objects.check_permissions(request.user, [PERMISSION_TAG_DELETE]) Permission.objects.check_permissions(request.user, [PERMISSION_TAG_DELETE])
except PermissionDenied: except PermissionDenied:
tags = AccessEntry.objects.filter_objects_by_access(PERMISSION_TAG_DELETE, request.user, tags) tags = AccessEntry.objects.filter_objects_by_access(PERMISSION_TAG_DELETE, request.user, tags)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
for tag in tags: for tag in tags:
@@ -272,7 +273,7 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one tagged document.')) messages.error(request, _(u'Must provide at least one tagged document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try: try:
Permission.objects.check_permissions(request.user, [PERMISSION_TAG_REMOVE]) Permission.objects.check_permissions(request.user, [PERMISSION_TAG_REMOVE])
@@ -281,8 +282,8 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta
post_action_redirect = None post_action_redirect = None
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
context = { context = {
'previous': previous, 'previous': previous,

19
mayan/apps/user_management/views.py
View File

@@ -4,6 +4,7 @@ from django.contrib import messages
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404 from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext from django.template import RequestContext
@@ -58,7 +59,7 @@ def user_edit(request, user_id):
if user.is_superuser or user.is_staff: if user.is_superuser or user.is_staff:
messages.error(request, _(u'Super user and staff user editing is not allowed, use the admin interface for these cases.')) messages.error(request, _(u'Super user and staff user editing is not allowed, use the admin interface for these cases.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
if request.method == 'POST': if request.method == 'POST':
form = UserForm(instance=user, data=request.POST) form = UserForm(instance=user, data=request.POST)
@@ -108,10 +109,10 @@ def user_delete(request, user_id=None, user_id_list=None):
users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')] users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one user.')) messages.error(request, _(u'Must provide at least one user.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
for user in users: for user in users:
@@ -162,9 +163,9 @@ def user_set_password(request, user_id=None, user_id_list=None):
users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')] users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one user.')) messages.error(request, _(u'Must provide at least one user.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
form = PasswordForm(request.POST) form = PasswordForm(request.POST)
@@ -315,10 +316,10 @@ def group_delete(request, group_id=None, group_id_list=None):
groups = [get_object_or_404(Group, pk=group_id) for group_id in group_id_list.split(',')] groups = [get_object_or_404(Group, pk=group_id) for group_id in group_id_list.split(',')]
else: else:
messages.error(request, _(u'Must provide at least one group.')) messages.error(request, _(u'Must provide at least one group.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method == 'POST': if request.method == 'POST':
for group in groups: for group in groups: