From a651921ca24edf0220670c77e60958ed24f484f1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 23 Oct 2014 02:38:17 -0400 Subject: [PATCH] Use parent class instead of specific child classes --- mayan/apps/sources/views.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index a57e3b73ea..8c3b91e9a7 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -27,8 +27,8 @@ from .forms import (StagingDocumentForm, SourceTransformationForm, SourceTransformationForm_create, WebFormForm) from .literals import (SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WEB_FORM, SOURCE_UNCOMPRESS_CHOICE_ASK, SOURCE_UNCOMPRESS_CHOICE_Y) -from .models import (Source, StagingFolderSource, SourceTransformation, - WebFormSource) +from .models import (InteractiveSource, Source, StagingFolderSource, + SourceTransformation, WebFormSource) from .permissions import (PERMISSION_SOURCES_SETUP_CREATE, PERMISSION_SOURCES_SETUP_DELETE, PERMISSION_SOURCES_SETUP_EDIT, @@ -110,9 +110,7 @@ def upload_interactive(request, source_id=None, document_pk=None): context = {} - # TODO: use InteractiveSource.objects.count() instead - if results[SOURCE_CHOICE_WEB_FORM].count() == 0 and results[SOURCE_CHOICE_STAGING].count() == 0: - source_setup_link = mark_safe('%s' % (reverse('sources:setup_source_list'), ugettext(u'Here'))) + if InteractiveSource.objects.count() == 0: subtemplates_list.append( { 'name': 'main/generic_subtemplate.html', @@ -120,9 +118,6 @@ def upload_interactive(request, source_id=None, document_pk=None): 'title': _(u'Upload sources'), 'paragraphs': [ _(u'No interactive document sources have been defined or none have been enabled.'), - _(u'Click %(setup_link)s to add or enable some document sources.') % { - 'setup_link': source_setup_link - } ], } }) @@ -133,6 +128,7 @@ def upload_interactive(request, source_id=None, document_pk=None): else: document_type = None + # TODO: Use InteractiveSource subclasses query if source_id is None: if results[SOURCE_CHOICE_WEB_FORM].count(): source_id = results[SOURCE_CHOICE_WEB_FORM][0].pk