Skip to content

[JARS-146] Resource should be accessible even if there is no title #147

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

Open
prnvshrn wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[JARS-146] Resource should be accessible even if there is no title #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1cabf6
[JARS-146] resources with blank entry can be deleted
Dec 7, 2018
a1c7b8d
[JARS-146] resources with blank entry can be deleted
Dec 7, 2018
34873b2
[JARS-146] added check for username
Dec 11, 2018
bd43051
[JARS-146] added authorization for collection
Dec 12, 2018
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
5 changes: 5 additions & 0 deletions cookies/templates/fragment_resource_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@
{% for resource in resources %}
<div class="list-group-item resource-item" id="resource-{{ resource.primary.id }}">
{% if user.is_authenticated %}<input type="checkbox" name="addresources" id="select-{{ resource.primary.id }}" value={{resource.primary.id}}>{% endif %}
{% if resource.primary.id %}
<a href="{{ resource.primary.get_absolute_url }}">{{ resource.primary.name }}</a> <span class="text-muted">{{ resource.primary.entity_type }}</span>
{% else %}
Invalid entry
<span class="glyphicon glyphicon-trash openDeleteResourceModal" data-url="{% url 'delete-resource' resource.id %}" style="color:red;"></span>
{% endif %}
<div>
<span class="text-muted">Added by <span class="text-warning">{{ resource.primary.created_by }}</span> on {{ resource.primary.created }} Last updated on {{ resource.primary.updated }}</span>
<span class="pull-right btn-group">
Expand Down
32 changes: 31 additions & 1 deletion cookies/templates/resources.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{% load addcss %}



{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'index' %}">{% trans 'Home' %}</a>
Expand Down Expand Up @@ -132,7 +133,36 @@ <h4 class="panel-title">
</div>
</div>


<script>
jQuery(document).ready(function($) {
$(".openDeleteResourceModal").click(function(e) {
var url = $(this).attr("data-url");
$('#deleteResourceModalForm').attr('action', url);
$('#deleteResourceModal').modal('show');
});
});
</script>

<div id="deleteResourceModal" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Delete entry</h4>
</div>
<div class="modal-body">
<p>Do you want to delete this invalid entry? </p>
</div>
<div class="modal-footer">
<form id="deleteResourceModalForm" action="." method="post">
{% csrf_token %}
<input class="btn btn-danger" type="submit" value="Delete">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</form>
</div>
</div>
</div>
</div>


{% endblock %}
10 changes: 10 additions & 0 deletions cookies/views/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,3 +939,13 @@ def create_dataset(request):
'collection_count': collections.count(),
}
return render(request, 'create_dataset.html', context)


@login_required
@auth.authorization_required(CollectionAuthorization.REMOVE, _get_resource_by_id)
def delete_resource(request, resource_id):
Copy link
Member

@jdamerow jdamerow Dec 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission check is needed

# Extra check to ensure that only resources which do not have primary id get deleted.
resource_container = ResourceContainer.objects.get(pk=resource_id)
if resource_container.primary_id is None and request.user.id == resource_container.created_by_id:
Copy link
Member

@jdamerow jdamerow Dec 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to check with the permissions here. other people can have access to a resource and can delete them.

ResourceContainer.objects.filter(id=resource_id).delete()
return HttpResponseRedirect(reverse('resources'))
1 change: 1 addition & 0 deletions jars/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
url(r'^resource/create/giles/process/([0-9]+)/$', views.giles.set_giles_upload_collection, name="create-process-giles"),
url(r'^resource/create/details/([0-9]+)/$', views.resource.create_resource_details, name="create-resource-details"),
url(r'^resource/create/bulk/$', views.resource.create_resource_bulk, name="create-resource-bulk"),
url(r'^resource/([0-9]+)/delete/$', views.resource.delete_resource, name="delete-resource"),
url(r'^collection/([0-9]+)/$', views.collection.collection, name="collection"),
url(r'^collection/([0-9]+)/edit/$', views.collection.collection_edit, name="collection-edit"),
url(r'^collection/([0-9]+)/authorizations/$', views.collection.collection_authorizations, name="collection-authorizations"),
Expand Down