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

Solve issue #70

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-13 17:16:14 -04:00
parent bcc71bebd2
commit 6e3b62363e
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/document_signatures/views.py
View File

@@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _
from acls.models import AccessEntry
from django_gpg.literals import SIGNATURE_STATE_NONE, SIGNATURE_STATES
from documents.models import Document, RecentDocument
from documents.models import Document
from filetransfers.api import serve_file
from permissions.models import Permission
@@ -38,7 +38,7 @@ def document_verify(request, document_pk):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VERIFY, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
try:
signature = DocumentVersionSignature.objects.verify_signature(document)
@@ -91,7 +91,7 @@ def document_signature_upload(request, document_pk):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_SIGNATURE_UPLOAD, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
post_action_redirect = None
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home'))))
@@ -152,7 +152,7 @@ def document_signature_delete(request, document_pk):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DELETE, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
post_action_redirect = None
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home'))))

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

@@ -102,7 +102,7 @@ def document_view(request, document_id, advanced=False):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
subtemplates_list = []
@@ -245,7 +245,7 @@ def document_edit(request, document_id):
document.save()
create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])})
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
messages.success(request, _(u'Document "%s" edited successfully.') % document)
@@ -794,7 +794,7 @@ def document_print(request, document_id):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
post_redirect = None
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_redirect or document.get_absolute_url())))
@@ -837,7 +837,7 @@ def document_hard_copy(request, document_id):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
page_range = request.GET.get('page_range', u'')
if page_range:
@@ -1115,7 +1115,7 @@ def document_version_list(request, document_pk):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
context = {
'object_list': document.versions.order_by('-timestamp'),

4
mayan/apps/mailer/views.py
View File

@@ -11,7 +11,7 @@ from django.utils.html import strip_tags
from django.utils.translation import ugettext_lazy as _
from acls.models import AccessEntry
from documents.models import Document, RecentDocument
from documents.models import Document
from permissions.models import Permission
from .forms import DocumentMailForm
@@ -45,7 +45,7 @@ def send_document_link(request, document_id=None, document_id_list=None, as_atta
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect)))
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
if request.method == 'POST':
form = DocumentMailForm(request.POST, as_attachment=as_attachment)

8
mayan/apps/metadata/views.py
View File

@@ -10,7 +10,7 @@ from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _
from acls.models import AccessEntry
from documents.models import Document, RecentDocument, DocumentType
from documents.models import Document, DocumentType
from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
from permissions.models import Permission
@@ -61,7 +61,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
metadata = {}
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
for item in document.metadata.all():
value = item.value
@@ -136,7 +136,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse('main:home')))
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
post_action_redirect = reverse('documents:document_list_recent')
@@ -212,7 +212,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
metadata = {}
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
document.add_as_recent_document_for_user(request.user)
for item in document.metadata.all():
value = item.value