Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: auditors cannot upload/delete the document #357

Merged
merged 7 commits into from
Jul 7, 2022
Merged

feat: auditors cannot upload/delete the document #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45b1f78
feat: only local custodians can delete the document
jLebioda Jul 6, 2022
ee00832
feat: upload document requires PROTECTED premission
vildead Jul 7, 2022
d1912df
feat: AUDITORS cannot delete document
vildead Jul 7, 2022
0af99cc
feat: AUDITORS cannot upload document
vildead Jul 7, 2022
79fad63
fix: document upload validation is done using content type checker
vildead Jul 7, 2022
b2b31d2
refactor: remove unused function
vildead Jul 7, 2022
bccb967
fix: EDIT permission is required to upload or delete document
vildead Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/models/data_declaration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ class Meta:
null=False,
help_text='How has the data been de-identified, is it pseudonymized or anonymized?')


embargo_date = models.DateField(verbose_name='Embargo date',
blank=True,
null=True,
Expand Down
1 change: 1 addition & 0 deletions core/models/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def shortname(self):
def size(self):
return self.content.size


@receiver(post_delete, sender=Document, dispatch_uid='document_delete')
def document_cleanup(sender, instance, **kwargs):
if hasattr(instance.content, 'path') and os.path.exists(instance.content.path):
Expand Down
7 changes: 5 additions & 2 deletions web/views/documents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from core.constants import Permissions
from core.forms import DocumentForm
from core.models import Document
from core.permissions import permission_required
from core.permissions import permission_required, permission_required_from_content_type
from core.utils import DaisyLogger


Expand All @@ -26,6 +26,8 @@ def rfc5987_content_disposition(file_name):
return header


@permission_required_from_content_type(Permissions.PROTECTED, content_type_attr='content_type', object_id_attr='object_id')
@permission_required_from_content_type(Permissions.EDIT, content_type_attr='content_type', object_id_attr='object_id')
def upload_document(request, object_id, content_type):
log.debug('uploading document', post=request.POST, files=request.FILES)
if request.method == 'POST':
Expand Down Expand Up @@ -96,6 +98,7 @@ def download_document(request, pk):

@require_http_methods(["DELETE"])
@permission_required(Permissions.PROTECTED, (Document, 'pk', 'pk'))
@permission_required(Permissions.EDIT, (Document, 'pk', 'pk'))
def delete_document(request, pk):
document = get_object_or_404(Document, pk=pk)
# perm = PERMISSION_MAPPING[document.content_type.name].DELETE.value
Expand All @@ -104,7 +107,7 @@ def delete_document(request, pk):
try:
document.delete()
except Exception as e:
return JsonResponse({'message': str(e)})
return JsonResponse({'message': str(e)}, status=403)
return JsonResponse({'message': 'document deleted'})