diff --git a/atlas/decorators.py b/atlas/decorators.py index 5c063341..16c6b4fa 100755 --- a/atlas/decorators.py +++ b/atlas/decorators.py @@ -2,11 +2,12 @@ from django.core.exceptions import PermissionDenied from .models import Case, CaseCollection, Series -def user_is_author_or_atlas_series_checker_or_atlas_marker(function): +def user_is_author_or_atlas_series_checker_or_atlas_marker_or_open_access(function): def wrap(request, *args, **kwargs): series = Series.objects.get(pk=kwargs["pk"]) if ( request.user in series.get_author_objects() + or series.open_access or request.user.groups.filter(name="atlas_editor").exists() or request.user.groups.filter(name="atlas_marker").exists() or request.user.is_superuser diff --git a/atlas/templates/atlas/series.html b/atlas/templates/atlas/series.html index f91f579e..9cd9ff22 100755 --- a/atlas/templates/atlas/series.html +++ b/atlas/templates/atlas/series.html @@ -4,7 +4,9 @@ {% block navigation%} {{ block.super }} - {% include 'atlas/series_headers.html' %} + {% if can_edit %} + {% include 'atlas/series_headers.html' %} + {% endif %} {% endblock %} {% block content %} diff --git a/atlas/templates/atlas/series_viewer.html b/atlas/templates/atlas/series_viewer.html index 65bd1e66..d3aba48b 100755 --- a/atlas/templates/atlas/series_viewer.html +++ b/atlas/templates/atlas/series_viewer.html @@ -16,20 +16,24 @@
{{finding.annotation_json}}
- {{finding.viewport_json}}
- {{finding.current_image_id_index}}
- - This will limit the series to the selected bounds (the rest of the images will be deleted). This is useful when you have a large volume of which only a small area is relevant to the case. NOTE: once deleted the images cannot be recovered on the site (they would have to be reuploaded if required). Make sure your images are shown in the correct order above and use test the test truncate button first. -
- Start+ This will limit the series to the selected bounds (the rest of the images will be deleted). This is useful when you have a large volume of which only a small area is relevant to the case. NOTE: once deleted the images cannot be recovered on the site (they would have to be reuploaded if required). Make sure your images are shown in the correct order above and use test the test truncate button first. +
+ StartTotal image size: {{series.get_total_image_size|filesizeformat}}
- show all diff +show all diff +{% endif %}