diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index 7f0f359a20..043ea27f12 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -32,12 +32,12 @@ from .links import ( link_document_list_recent, link_document_multiple_delete, link_document_multiple_clear_transformations, link_document_multiple_download, - link_document_multiple_update_page_count, link_document_page_edit, + link_document_multiple_update_page_count, link_document_page_navigation_first, link_document_page_navigation_last, link_document_page_navigation_next, link_document_page_navigation_previous, link_document_page_return, link_document_page_rotate_left, link_document_page_rotate_right, - link_document_page_text, link_document_page_transformation_list, + link_document_page_transformation_list, link_document_page_transformation_create, link_document_page_transformation_edit, link_document_page_transformation_delete, link_document_page_view, @@ -133,10 +133,10 @@ class DocumentsApp(apps.AppConfig): # Document pages menu_facet.bind_links(links=[link_document_page_rotate_left, link_document_page_rotate_right, link_document_page_zoom_in, link_document_page_zoom_out, link_document_page_view_reset], sources=['documents:document_page_view']) - menu_facet.bind_links(links=[link_document_page_return, link_document_page_view, link_document_page_text], sources=[DocumentPage]) + menu_facet.bind_links(links=[link_document_page_return, link_document_page_view], sources=[DocumentPage]) menu_facet.bind_links(links=[link_document_page_navigation_first, link_document_page_navigation_previous, link_document_page_navigation_next, link_document_page_navigation_last, link_document_page_transformation_list], sources=[DocumentPage]) menu_object.bind_links(links=[link_document_page_transformation_edit, link_document_page_transformation_delete], sources=[DocumentPageTransformation]) - menu_sidebar.bind_links(links=[link_document_page_edit, link_document_page_transformation_create], sources=[DocumentPage, 'documents:document_page_transformation_create']) + menu_sidebar.bind_links(links=[link_document_page_transformation_create], sources=[DocumentPage, 'documents:document_page_transformation_create']) namespace = StatisticNamespace(name='documents', label=_('Documents')) namespace.add_statistic(DocumentStatistics(name='document_stats', label=_('Document tendencies'))) diff --git a/mayan/apps/documents/forms.py b/mayan/apps/documents/forms.py index d6e981b60f..66d382f96b 100644 --- a/mayan/apps/documents/forms.py +++ b/mayan/apps/documents/forms.py @@ -48,36 +48,6 @@ class DocumentPageForm(DetailForm): ) -class DocumentPageForm_text(DetailForm): - class Meta: - fields = ('page_label', 'content') - model = DocumentPage - - content = forms.CharField( - label=_('Contents'), - widget=forms.widgets.Textarea(attrs={ - 'rows': 18, 'cols': 80, 'readonly': 'readonly' - })) - - -class DocumentPageForm_edit(forms.ModelForm): - class Meta: - fields = ('page_label', 'content') - model = DocumentPage - - def __init__(self, *args, **kwargs): - super(DocumentPageForm_edit, self).__init__(*args, **kwargs) - self.fields['page_image'].initial = self.instance - self.fields.keyOrder = [ - 'page_image', - 'page_label', - 'content', - ] - page_image = forms.CharField( - required=False, widget=DocumentPageImageWidget() - ) - - # Document forms diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index 8c9ac94dd9..9e77fa8b67 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -77,7 +77,6 @@ link_document_page_transformation_create = Link(args='page.pk', permissions=[PER link_document_page_transformation_delete = Link(args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], tags='dangerous', text=_('Delete'), view='documents:document_page_transformation_delete') link_document_page_transformation_edit = Link(args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Edit'), view='documents:document_page_transformation_edit') link_document_page_transformation_list = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Transformations'), view='documents:document_page_transformation_list') -link_document_page_edit = Link(permissions=[PERMISSION_DOCUMENT_EDIT], text=_('Edit page text'), view='documents:document_page_edit', args='page.pk') link_document_page_navigation_first = Link(conditional_disable=is_first_page, icon='fa fa-step-backward', keep_query=True, permissions=[PERMISSION_DOCUMENT_VIEW], text=_('First page'), view='documents:document_page_navigation_first', args='page.pk') link_document_page_navigation_last = Link(conditional_disable=is_last_page, icon='fa fa-step-forward', keep_query=True, text=_('Last page'), permissions=[PERMISSION_DOCUMENT_VIEW], view='documents:document_page_navigation_last', args='page.pk') link_document_page_navigation_previous = Link(conditional_disable=is_first_page, icon='fa fa-arrow-left', keep_query=True, permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Previous page'), view='documents:document_page_navigation_previous', args='page.pk') @@ -85,7 +84,6 @@ link_document_page_navigation_next = Link(conditional_disable=is_last_page, icon link_document_page_return = Link(icon='fa fa-file', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Document'), view='documents:document_preview', args='page.document.pk') link_document_page_rotate_left = Link(icon='fa fa-rotate-left', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate left'), view='documents:document_page_rotate_left', args='page.pk') link_document_page_rotate_right = Link(icon='fa fa-rotate-right', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate right'), view='documents:document_page_rotate_right', args='page.pk') -link_document_page_text = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page text'), view='documents:document_page_text') link_document_page_view = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page image'), view='documents:document_page_view') link_document_page_view_reset = Link(permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Reset view'), view='documents:document_page_view_reset', args='page.pk') link_document_page_zoom_in = Link(conditional_disable=is_max_zoom, icon='fa fa-search-plus', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Zoom in'), view='documents:document_page_zoom_in', args='page.pk') diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 857e9c9ec4..17bb6b6d03 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -48,8 +48,6 @@ urlpatterns = patterns( url(r'^maintenance/clear_image_cache/$', 'document_clear_image_cache', (), 'document_clear_image_cache'), url(r'^page/(?P\d+)/$', 'document_page_view', (), 'document_page_view'), - url(r'^page/(?P\d+)/text/$', 'document_page_text', (), 'document_page_text'), - url(r'^page/(?P\d+)/edit/$', 'document_page_edit', (), 'document_page_edit'), url(r'^page/(?P\d+)/navigation/next/$', 'document_page_navigation_next', (), 'document_page_navigation_next'), url(r'^page/(?P\d+)/navigation/previous/$', 'document_page_navigation_previous', (), 'document_page_navigation_previous'), url(r'^page/(?P\d+)/navigation/first/$', 'document_page_navigation_first', (), 'document_page_navigation_first'), diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index a647e971af..a6da8e6cb6 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -31,7 +31,6 @@ from .events import ( ) from .forms import ( DocumentContentForm, DocumentDownloadForm, DocumentForm, DocumentPageForm, - DocumentPageForm_edit, DocumentPageForm_text, DocumentPageTransformationForm, DocumentPreviewForm, DocumentPropertiesForm, DocumentTypeForm, DocumentTypeFilenameForm, DocumentTypeFilenameForm_create, DocumentTypeSelectForm, PrintForm @@ -620,53 +619,6 @@ def document_page_view_reset(request, document_page_id): return HttpResponseRedirect(reverse('documents:document_page_view', args=[document_page_id])) -def document_page_text(request, document_page_id): - document_page = get_object_or_404(DocumentPage, pk=document_page_id) - try: - Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW]) - except PermissionDenied: - AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document) - - document_page_form = DocumentPageForm_text(instance=document_page) - - return render_to_response('appearance/generic_form.html', { - 'access_object': document_page.document, - 'form': document_page_form, - 'page': document_page, - 'navigation_object_list': ['page'], - 'read_only': True, - 'title': _('Details for: %s') % document_page, - }, context_instance=RequestContext(request)) - - -def document_page_edit(request, document_page_id): - document_page = get_object_or_404(DocumentPage, pk=document_page_id) - - try: - Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_EDIT]) - except PermissionDenied: - AccessEntry.objects.check_access(PERMISSION_DOCUMENT_EDIT, request.user, document_page.document) - - if request.method == 'POST': - form = DocumentPageForm_edit(request.POST, instance=document_page) - if form.is_valid(): - document_page.page_label = form.cleaned_data['page_label'] - document_page.content = form.cleaned_data['content'] - document_page.save() - messages.success(request, _('Document page edited successfully.')) - return HttpResponseRedirect(document_page.get_absolute_url()) - else: - form = DocumentPageForm_edit(instance=document_page) - - return render_to_response('appearance/generic_form.html', { - 'access_object': document_page.document, - 'form': form, - 'navigation_object_list': ['page'], - 'page': document_page, - 'title': _('Edit: %s') % document_page, - }, context_instance=RequestContext(request)) - - def document_page_navigation_next(request, document_page_id): document_page = get_object_or_404(DocumentPage, pk=document_page_id)