Add keyword arguments to the reverse use in views
Signed-off-by: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
This commit is contained in:
@@ -85,6 +85,7 @@
|
||||
* Update group members view permission. The group edit and
|
||||
user edit permission are now required.
|
||||
* Add keyword arguments to messages uses.
|
||||
* Add keyword arguments to the reverse use in views.
|
||||
|
||||
3.1.11 (2019-04-XX)
|
||||
===================
|
||||
|
||||
@@ -117,6 +117,7 @@ Other changes
|
||||
* Update group members view permission. The group edit and
|
||||
user edit permission are now required.
|
||||
* Add keyword arguments to messages uses.
|
||||
* Add keyword arguments to the reverse use in views.
|
||||
|
||||
Removals
|
||||
--------
|
||||
|
||||
@@ -99,10 +99,11 @@ class ACLDeleteView(SingleObjectDeleteView):
|
||||
def get_post_action_redirect(self):
|
||||
instance = self.get_object()
|
||||
return reverse(
|
||||
'acls:acl_list', args=(
|
||||
instance.content_type.app_label,
|
||||
instance.content_type.model, instance.object_id
|
||||
)
|
||||
viewname='acls:acl_list', kwargs={
|
||||
'app_label': instance.content_type.app_label,
|
||||
'model': instance.content_type.model,
|
||||
'object_id': instance.object_id
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -66,7 +66,11 @@ class CheckoutDocumentView(SingleObjectCreateView):
|
||||
}
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('checkouts:check_out_info', args=(self.document.pk,))
|
||||
return reverse(
|
||||
viewname='checkouts:check_out_info', kwargs={
|
||||
'pk': self.document.pk
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
class CheckoutListView(DocumentListView):
|
||||
@@ -153,7 +157,11 @@ class DocumentCheckinView(ConfirmView):
|
||||
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('checkouts:check_out_info', args=(self.get_object().pk,))
|
||||
return reverse(
|
||||
viewname='checkouts:check_out_info', kwargs={
|
||||
'pk': self.get_object().pk
|
||||
}
|
||||
)
|
||||
|
||||
def view_action(self):
|
||||
document = self.get_object()
|
||||
|
||||
@@ -46,11 +46,11 @@ class TransformationDeleteView(SingleObjectDeleteView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'converter:transformation_list', args=(
|
||||
self.transformation.content_type.app_label,
|
||||
self.transformation.content_type.model,
|
||||
self.transformation.object_id
|
||||
)
|
||||
viewname='converter:transformation_list', kwargs={
|
||||
'app_label': self.transformation.content_type.app_label,
|
||||
'model': self.transformation.content_type.model,
|
||||
'object_id': self.transformation.object_id
|
||||
}
|
||||
)
|
||||
|
||||
def get_extra_context(self):
|
||||
@@ -58,11 +58,11 @@ class TransformationDeleteView(SingleObjectDeleteView):
|
||||
'content_object': self.transformation.content_object,
|
||||
'navigation_object_list': ('content_object', 'transformation'),
|
||||
'previous': reverse(
|
||||
'converter:transformation_list', args=(
|
||||
self.transformation.content_type.app_label,
|
||||
self.transformation.content_type.model,
|
||||
self.transformation.object_id
|
||||
)
|
||||
viewname='converter:transformation_list', kwargs={
|
||||
'app_label': self.transformation.content_type.app_label,
|
||||
'model': self.transformation.content_type.model,
|
||||
'object_id': self.transformation.object_id
|
||||
}
|
||||
),
|
||||
'title': _(
|
||||
'Delete transformation "%(transformation)s" for: '
|
||||
@@ -123,10 +123,11 @@ class TransformationCreateView(SingleObjectCreateView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'converter:transformation_list', args=(
|
||||
self.kwargs['app_label'], self.kwargs['model'],
|
||||
self.kwargs['object_id']
|
||||
)
|
||||
viewname='converter:transformation_list', kwargs={
|
||||
'app_label': self.kwargs['app_label'],
|
||||
'model': self.kwargs['model'],
|
||||
'object_id': self.kwargs['object_id']
|
||||
}
|
||||
)
|
||||
|
||||
def get_queryset(self):
|
||||
@@ -177,11 +178,11 @@ class TransformationEditView(SingleObjectEditView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'converter:transformation_list', args=(
|
||||
self.transformation.content_type.app_label,
|
||||
self.transformation.content_type.model,
|
||||
self.transformation.object_id
|
||||
)
|
||||
viewname='converter:transformation_list', kwargs={
|
||||
'app_label': self.transformation.content_type.app_label,
|
||||
'model': self.transformation.content_type.model,
|
||||
'object_id': self.transformation.object_id
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -50,7 +50,9 @@ class DocumentCommentCreateView(SingleObjectCreateView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'comments:comments_for_document', args=(self.kwargs['pk'],)
|
||||
viewname='comments:comments_for_document', kwargs={
|
||||
'pk': self.kwargs['pk']
|
||||
}
|
||||
)
|
||||
|
||||
def get_save_extra_data(self):
|
||||
@@ -83,8 +85,9 @@ class DocumentCommentDeleteView(SingleObjectDeleteView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'comments:comments_for_document',
|
||||
args=(self.get_object().document.pk,)
|
||||
viewname='comments:comments_for_document', kwargs={
|
||||
'pk': self.get_object().document.pk
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -38,13 +38,17 @@ class SetupIndexCreateView(SingleObjectCreateView):
|
||||
extra_context = {'title': _('Create index')}
|
||||
fields = ('label', 'slug', 'enabled')
|
||||
model = Index
|
||||
post_action_redirect = reverse_lazy('indexing:index_setup_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='indexing:index_setup_list'
|
||||
)
|
||||
view_permission = permission_document_indexing_create
|
||||
|
||||
|
||||
class SetupIndexDeleteView(SingleObjectDeleteView):
|
||||
model = Index
|
||||
post_action_redirect = reverse_lazy('indexing:index_setup_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='indexing:index_setup_list'
|
||||
)
|
||||
object_permission = permission_document_indexing_delete
|
||||
|
||||
def get_extra_context(self):
|
||||
@@ -57,7 +61,9 @@ class SetupIndexDeleteView(SingleObjectDeleteView):
|
||||
class SetupIndexEditView(SingleObjectEditView):
|
||||
fields = ('label', 'slug', 'enabled')
|
||||
model = Index
|
||||
post_action_redirect = reverse_lazy('indexing:index_setup_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='indexing:index_setup_list'
|
||||
)
|
||||
object_permission = permission_document_indexing_edit
|
||||
|
||||
def get_extra_context(self):
|
||||
@@ -204,7 +210,9 @@ class TemplateNodeDeleteView(SingleObjectDeleteView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'indexing:index_setup_view', args=(self.get_object().index.pk,)
|
||||
viewname='indexing:index_setup_view', kwargs={
|
||||
'pk': self.get_object().index.pk
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -226,7 +234,9 @@ class TemplateNodeEditView(SingleObjectEditView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'indexing:index_setup_view', args=(self.get_object().index.pk,)
|
||||
viewname='indexing:index_setup_view', kwargs={
|
||||
'pk': self.get_object().index.pk
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -397,4 +407,4 @@ class IndexesRebuildView(FormView):
|
||||
}
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('common:tools_list')
|
||||
return reverse(viewname='common:tools_list')
|
||||
|
||||
@@ -70,8 +70,8 @@ class DocumentVersionDetachedSignatureCreateView(FormView):
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'signatures:document_version_signature_detached_create',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_detached_create',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
)
|
||||
except PassphraseError:
|
||||
@@ -81,8 +81,8 @@ class DocumentVersionDetachedSignatureCreateView(FormView):
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'signatures:document_version_signature_detached_create',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_detached_create',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
)
|
||||
else:
|
||||
@@ -132,8 +132,8 @@ class DocumentVersionDetachedSignatureCreateView(FormView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'signatures:document_version_signature_list',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_list',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
|
||||
|
||||
@@ -160,8 +160,8 @@ class DocumentVersionEmbeddedSignatureCreateView(FormView):
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'signatures:document_version_signature_embedded_create',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_embedded_create',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
)
|
||||
except PassphraseError:
|
||||
@@ -171,8 +171,8 @@ class DocumentVersionEmbeddedSignatureCreateView(FormView):
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'signatures:document_version_signature_embedded_create',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_embedded_create',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
)
|
||||
else:
|
||||
@@ -194,7 +194,7 @@ class DocumentVersionEmbeddedSignatureCreateView(FormView):
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
viewname='signatures:document_version_signature_list',
|
||||
args=(new_version.pk,)
|
||||
kwargs={'pk': new_version.pk}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -241,8 +241,8 @@ class DocumentVersionSignatureDeleteView(SingleObjectDeleteView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'signatures:document_version_signature_list',
|
||||
args=(self.get_object().document_version.pk,)
|
||||
viewname='signatures:document_version_signature_list',
|
||||
kwargs={'pk': self.get_object().document_version.pk}
|
||||
)
|
||||
|
||||
|
||||
@@ -360,8 +360,8 @@ class DocumentVersionSignatureUploadView(SingleObjectCreateView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'signatures:document_version_signature_list',
|
||||
args=(self.get_document_version().pk,)
|
||||
viewname='signatures:document_version_signature_list',
|
||||
kwargs={'pk': self.get_document_version().pk}
|
||||
)
|
||||
|
||||
|
||||
@@ -374,7 +374,7 @@ class AllDocumentSignatureVerifyView(ConfirmView):
|
||||
view_permission = permission_document_version_signature_verify
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('common:tools_list')
|
||||
return reverse(viewname='common:tools_list')
|
||||
|
||||
def view_action(self):
|
||||
task_verify_missing_embedded_signature.delay()
|
||||
|
||||
@@ -62,7 +62,9 @@ class SearchView(SearchModelMixin, SimpleView):
|
||||
return {
|
||||
'form': self.get_form(),
|
||||
'form_action': reverse(
|
||||
'search:results', args=(self.search_model.get_full_name(),)
|
||||
viewname='search:results', kwargs={
|
||||
'search_model': self.search_model.get_full_name()
|
||||
}
|
||||
),
|
||||
'search_model': self.search_model,
|
||||
'submit_icon_class': icon_search_submit,
|
||||
|
||||
@@ -203,14 +203,18 @@ class DocumentSmartLinkListView(SmartLinkListView):
|
||||
class SmartLinkCreateView(SingleObjectCreateView):
|
||||
extra_context = {'title': _('Create new smart link')}
|
||||
form_class = SmartLinkForm
|
||||
post_action_redirect = reverse_lazy('linking:smart_link_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='linking:smart_link_list'
|
||||
)
|
||||
view_permission = permission_smart_link_create
|
||||
|
||||
|
||||
class SmartLinkEditView(SingleObjectEditView):
|
||||
form_class = SmartLinkForm
|
||||
model = SmartLink
|
||||
post_action_redirect = reverse_lazy('linking:smart_link_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='linking:smart_link_list'
|
||||
)
|
||||
view_permission = permission_smart_link_edit
|
||||
|
||||
def get_extra_context(self):
|
||||
@@ -222,7 +226,9 @@ class SmartLinkEditView(SingleObjectEditView):
|
||||
|
||||
class SmartLinkDeleteView(SingleObjectDeleteView):
|
||||
model = SmartLink
|
||||
post_action_redirect = reverse_lazy('linking:smart_link_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='linking:smart_link_list'
|
||||
)
|
||||
view_permission = permission_smart_link_delete
|
||||
|
||||
def get_extra_context(self):
|
||||
@@ -292,9 +298,9 @@ class SmartLinkConditionCreateView(SingleObjectCreateView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'linking:smart_link_condition_list', args=(
|
||||
self.get_smart_link().pk,
|
||||
)
|
||||
viewname='linking:smart_link_condition_list', kwargs={
|
||||
'pk': self.get_smart_link().pk
|
||||
}
|
||||
)
|
||||
|
||||
def get_queryset(self):
|
||||
@@ -328,9 +334,9 @@ class SmartLinkConditionEditView(SingleObjectEditView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'linking:smart_link_condition_list', args=(
|
||||
self.get_object().smart_link.pk,
|
||||
)
|
||||
viewname='linking:smart_link_condition_list', kwargs={
|
||||
'pk': self.get_object().smart_link.pk
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -359,7 +365,7 @@ class SmartLinkConditionDeleteView(SingleObjectDeleteView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'linking:smart_link_condition_list', args=(
|
||||
self.get_object().smart_link.pk,
|
||||
)
|
||||
viewname='linking:smart_link_condition_list', kwargs={
|
||||
'pk': self.get_object().smart_link.pk
|
||||
}
|
||||
)
|
||||
|
||||
@@ -124,7 +124,11 @@ class UserMailerBackendSelectionView(FormView):
|
||||
def form_valid(self, form):
|
||||
backend = form.cleaned_data['backend']
|
||||
return HttpResponseRedirect(
|
||||
reverse('mailer:user_mailer_create', args=(backend,),)
|
||||
reverse(
|
||||
viewname='mailer:user_mailer_create', kwargs={
|
||||
'class_path': backend
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -87,8 +87,9 @@ class StatisticQueueView(ConfirmView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'statistics:statistic_detail',
|
||||
args=(self.get_object().slug,)
|
||||
viewname='statistics:statistic_detail', kwargs={
|
||||
'slug': self.get_object().slug
|
||||
}
|
||||
)
|
||||
|
||||
def view_action(self):
|
||||
|
||||
@@ -80,12 +80,16 @@ class DocumentMetadataAddView(MultipleObjectFormActionView):
|
||||
|
||||
if self.action_count == 1:
|
||||
return HttpResponseRedirect(
|
||||
reverse('metadata:metadata_edit', args=(queryset.first().pk,)),
|
||||
reverse(
|
||||
viewname='metadata:metadata_edit', kwargs={
|
||||
'pk': queryset.first().pk
|
||||
}
|
||||
)
|
||||
)
|
||||
elif self.action_count > 1:
|
||||
return HttpResponseRedirect(
|
||||
'%s?%s' % (
|
||||
reverse('metadata:metadata_multiple_edit'),
|
||||
reverse(viewname='metadata:metadata_multiple_edit'),
|
||||
urlencode(
|
||||
{
|
||||
'id_list': ','.join(
|
||||
@@ -244,12 +248,16 @@ class DocumentMetadataEditView(MultipleObjectFormActionView):
|
||||
|
||||
if self.action_count == 1:
|
||||
return HttpResponseRedirect(
|
||||
reverse('metadata:metadata_edit', args=(queryset.first().pk,)),
|
||||
reverse(
|
||||
viewname='metadata:metadata_edit', kwargs={
|
||||
'pk': queryset.first().pk
|
||||
}
|
||||
)
|
||||
)
|
||||
elif self.action_count > 1:
|
||||
return HttpResponseRedirect(
|
||||
'%s?%s' % (
|
||||
reverse('metadata:metadata_multiple_edit'),
|
||||
reverse(viewname='metadata:metadata_multiple_edit'),
|
||||
urlencode(
|
||||
{
|
||||
'id_list': ','.join(
|
||||
@@ -463,12 +471,16 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView):
|
||||
|
||||
if self.action_count == 1:
|
||||
return HttpResponseRedirect(
|
||||
reverse('metadata:metadata_edit', args=(queryset.first().pk,)),
|
||||
reverse(
|
||||
viewname='metadata:metadata_edit', kwargs={
|
||||
'pk': queryset.first().pk
|
||||
}
|
||||
)
|
||||
)
|
||||
elif self.action_count > 1:
|
||||
return HttpResponseRedirect(
|
||||
'%s?%s' % (
|
||||
reverse('metadata:metadata_multiple_edit'),
|
||||
reverse(viewname='metadata:metadata_multiple_edit'),
|
||||
urlencode(
|
||||
{
|
||||
'id_list': ','.join(
|
||||
@@ -574,7 +586,9 @@ class MetadataTypeCreateView(SingleObjectCreateView):
|
||||
extra_context = {'title': _('Create metadata type')}
|
||||
form_class = MetadataTypeForm
|
||||
model = MetadataType
|
||||
post_action_redirect = reverse_lazy('metadata:setup_metadata_type_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='metadata:setup_metadata_type_list'
|
||||
)
|
||||
view_permission = permission_metadata_type_create
|
||||
|
||||
def get_save_extra_data(self):
|
||||
@@ -586,7 +600,9 @@ class MetadataTypeCreateView(SingleObjectCreateView):
|
||||
class MetadataTypeDeleteView(SingleObjectDeleteView):
|
||||
model = MetadataType
|
||||
object_permission = permission_metadata_type_delete
|
||||
post_action_redirect = reverse_lazy('metadata:setup_metadata_type_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='metadata:setup_metadata_type_list'
|
||||
)
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
@@ -600,7 +616,9 @@ class MetadataTypeEditView(SingleObjectEditView):
|
||||
form_class = MetadataTypeForm
|
||||
model = MetadataType
|
||||
object_permission = permission_metadata_type_edit
|
||||
post_action_redirect = reverse_lazy('metadata:setup_metadata_type_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='metadata:setup_metadata_type_list'
|
||||
)
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
@@ -717,7 +735,7 @@ class SetupDocumentTypeMetadataTypes(FormView):
|
||||
return obj
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('documents:document_type_list')
|
||||
return reverse(viewname='documents:document_type_list')
|
||||
|
||||
def get_queryset(self):
|
||||
queryset = self.submodel.objects.all()
|
||||
@@ -754,4 +772,4 @@ class SetupMetadataTypesDocumentTypes(SetupDocumentTypeMetadataTypes):
|
||||
return initial
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('metadata:setup_metadata_type_list')
|
||||
return reverse(viewname='metadata:setup_metadata_type_list')
|
||||
|
||||
@@ -115,13 +115,15 @@ class DocumentTypeSubmitView(FormView):
|
||||
return HttpResponseRedirect(self.get_success_url())
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('common:tools_list')
|
||||
return reverse(viewname='common:tools_list')
|
||||
|
||||
|
||||
class DocumentTypeSettingsEditView(SingleObjectEditView):
|
||||
fields = ('auto_ocr',)
|
||||
object_permission = permission_document_type_ocr_setup
|
||||
post_action_redirect = reverse_lazy('documents:document_type_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='documents:document_type_list'
|
||||
)
|
||||
|
||||
def get_document_type(self):
|
||||
return get_object_or_404(klass=DocumentType, pk=self.kwargs['pk'])
|
||||
|
||||
@@ -77,7 +77,7 @@ class SettingEditView(FormView):
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
'settings:namespace_detail', args=(
|
||||
self.get_object().namespace.name,
|
||||
)
|
||||
viewname='settings:namespace_detail', kwargs={
|
||||
'namespace_name': self.get_object().namespace.name
|
||||
}
|
||||
)
|
||||
|
||||
@@ -127,7 +127,9 @@ class UploadBaseView(MultiFormView):
|
||||
'none have been enabled, create one before proceeding.'
|
||||
), request=request
|
||||
)
|
||||
return HttpResponseRedirect(reverse('sources:setup_source_list'))
|
||||
return HttpResponseRedirect(
|
||||
reverse(viewname='sources:setup_source_list')
|
||||
)
|
||||
|
||||
return super(UploadBaseView, self).dispatch(request, *args, **kwargs)
|
||||
|
||||
@@ -298,7 +300,7 @@ class UploadInteractiveView(UploadBaseView):
|
||||
return HttpResponseRedirect(
|
||||
'{}?{}'.format(
|
||||
reverse(
|
||||
self.request.resolver_match.view_name,
|
||||
viewname=self.request.resolver_match.view_name,
|
||||
kwargs=self.request.resolver_match.kwargs
|
||||
), self.request.META['QUERY_STRING']
|
||||
),
|
||||
@@ -350,7 +352,7 @@ class UploadInteractiveView(UploadBaseView):
|
||||
{
|
||||
'form_action': '{}?{}'.format(
|
||||
reverse(
|
||||
self.request.resolver_match.view_name,
|
||||
viewname=self.request.resolver_match.view_name,
|
||||
kwargs=self.request.resolver_match.kwargs
|
||||
), self.request.META['QUERY_STRING']
|
||||
),
|
||||
@@ -380,7 +382,9 @@ class UploadInteractiveVersionView(UploadBaseView):
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'documents:document_version_list', args=(self.document.pk,)
|
||||
viewname='documents:document_version_list', kwargs={
|
||||
'pk': self.document.pk
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -433,7 +437,9 @@ class UploadInteractiveVersionView(UploadBaseView):
|
||||
|
||||
return HttpResponseRedirect(
|
||||
reverse(
|
||||
'documents:document_version_list', args=(self.document.pk,)
|
||||
viewname='documents:document_version_list', kwargs={
|
||||
'pk': self.document.pk
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -534,7 +540,9 @@ class SetupSourceCheckView(ConfirmView):
|
||||
|
||||
|
||||
class SetupSourceCreateView(SingleObjectCreateView):
|
||||
post_action_redirect = reverse_lazy('sources:setup_source_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='sources:setup_source_list'
|
||||
)
|
||||
view_permission = permission_sources_setup_create
|
||||
|
||||
def get_form_class(self):
|
||||
@@ -550,7 +558,9 @@ class SetupSourceCreateView(SingleObjectCreateView):
|
||||
|
||||
|
||||
class SetupSourceDeleteView(SingleObjectDeleteView):
|
||||
post_action_redirect = reverse_lazy('sources:setup_source_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='sources:setup_source_list'
|
||||
)
|
||||
view_permission = permission_sources_setup_delete
|
||||
|
||||
def get_object(self):
|
||||
@@ -569,7 +579,9 @@ class SetupSourceDeleteView(SingleObjectDeleteView):
|
||||
|
||||
|
||||
class SetupSourceEditView(SingleObjectEditView):
|
||||
post_action_redirect = reverse_lazy('sources:setup_source_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='sources:setup_source_list'
|
||||
)
|
||||
view_permission = permission_sources_setup_edit
|
||||
|
||||
def get_object(self):
|
||||
|
||||
@@ -85,7 +85,11 @@ class TagAttachActionView(MultipleObjectFormActionView):
|
||||
def get_post_action_redirect(self):
|
||||
queryset = self.get_queryset()
|
||||
if queryset.count() == 1:
|
||||
return reverse('tags:document_tags', args=(queryset.first().pk,))
|
||||
return reverse(
|
||||
viewname='tags:document_tags', kwargs={
|
||||
'pk': queryset.first().pk
|
||||
}
|
||||
)
|
||||
else:
|
||||
return super(TagAttachActionView, self).get_post_action_redirect()
|
||||
|
||||
@@ -123,7 +127,7 @@ class TagCreateView(SingleObjectCreateView):
|
||||
extra_context = {'title': _('Create tag')}
|
||||
fields = ('label', 'color')
|
||||
model = Tag
|
||||
post_action_redirect = reverse_lazy('tags:tag_list')
|
||||
post_action_redirect = reverse_lazy(viewname='tags:tag_list')
|
||||
view_permission = permission_tag_create
|
||||
|
||||
def get_save_extra_data(self):
|
||||
@@ -132,7 +136,7 @@ class TagCreateView(SingleObjectCreateView):
|
||||
|
||||
class TagDeleteActionView(MultipleObjectConfirmActionView):
|
||||
model = Tag
|
||||
post_action_redirect = reverse_lazy('tags:tag_list')
|
||||
post_action_redirect = reverse_lazy(viewname='tags:tag_list')
|
||||
object_permission = permission_tag_delete
|
||||
success_message = _('Tag delete request performed on %(count)d tag')
|
||||
success_message_plural = _(
|
||||
@@ -183,7 +187,7 @@ class TagEditView(SingleObjectEditView):
|
||||
fields = ('label', 'color')
|
||||
model = Tag
|
||||
object_permission = permission_tag_edit
|
||||
post_action_redirect = reverse_lazy('tags:tag_list')
|
||||
post_action_redirect = reverse_lazy(viewname='tags:tag_list')
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
@@ -329,7 +333,11 @@ class TagRemoveActionView(MultipleObjectFormActionView):
|
||||
def get_post_action_redirect(self):
|
||||
queryset = self.get_queryset()
|
||||
if queryset.count() == 1:
|
||||
return reverse('tags:document_tags', args=(queryset.first().pk,))
|
||||
return reverse(
|
||||
viewname='tags:document_tags', kwargs={
|
||||
'pk': queryset.first().pk
|
||||
}
|
||||
)
|
||||
else:
|
||||
return super(TagRemoveActionView, self).get_post_action_redirect()
|
||||
|
||||
|
||||
@@ -33,7 +33,9 @@ class GroupCreateView(SingleObjectCreateView):
|
||||
extra_context = {'title': _('Create new group')}
|
||||
fields = ('name',)
|
||||
model = Group
|
||||
post_action_redirect = reverse_lazy('user_management:group_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='user_management:group_list'
|
||||
)
|
||||
view_permission = permission_group_create
|
||||
|
||||
|
||||
@@ -41,7 +43,9 @@ class GroupEditView(SingleObjectEditView):
|
||||
fields = ('name',)
|
||||
model = Group
|
||||
object_permission = permission_group_edit
|
||||
post_action_redirect = reverse_lazy('user_management:group_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='user_management:group_list'
|
||||
)
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
@@ -76,7 +80,9 @@ class GroupListView(SingleObjectListView):
|
||||
class GroupDeleteView(SingleObjectDeleteView):
|
||||
model = Group
|
||||
object_permission = permission_group_delete
|
||||
post_action_redirect = reverse_lazy('user_management:group_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='user_management:group_list'
|
||||
)
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
@@ -158,7 +164,10 @@ class UserCreateView(SingleObjectCreateView):
|
||||
request=self.request
|
||||
)
|
||||
return HttpResponseRedirect(
|
||||
reverse('user_management:user_set_password', args=(user.pk,))
|
||||
reverse(
|
||||
viewname='user_management:user_set_password', kwargs={
|
||||
'pk': user.pk}
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -221,7 +230,9 @@ class UserDeleteView(MultipleObjectConfirmActionView):
|
||||
class UserEditView(SingleObjectEditView):
|
||||
fields = ('username', 'first_name', 'last_name', 'email', 'is_active',)
|
||||
object_permission = permission_user_edit
|
||||
post_action_redirect = reverse_lazy('user_management:user_list')
|
||||
post_action_redirect = reverse_lazy(
|
||||
viewname='user_management:user_list'
|
||||
)
|
||||
queryset = get_user_model().objects.filter(
|
||||
is_superuser=False, is_staff=False
|
||||
)
|
||||
@@ -308,7 +319,7 @@ class UserOptionsEditView(SingleObjectEditView):
|
||||
return self.get_user().user_options
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse('user_management:user_list')
|
||||
return reverse(viewname='user_management:user_list')
|
||||
|
||||
def get_user(self):
|
||||
return get_object_or_404(
|
||||
|
||||
Reference in New Issue
Block a user