Skip to content

Commit 2244437

Browse files
committed
Removed button on listing of datasets to remove a dataset from a space or a collection.
It was creating confusing for users who thought this was to delete the dataset. This functionality is still available on the dataset page.
1 parent 3ed5c71 commit 2244437

File tree

2 files changed

+0
-47
lines changed

2 files changed

+0
-47
lines changed

app/views/datasets/listitem.scala.html

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -77,29 +77,6 @@
7777
Download All Files</a>
7878
</div>
7979
}
80-
@if(user.isDefined) {
81-
@if(collectionId.isDefined) {
82-
@if(user.get.id.equals(dataset.author.id) || Permission.checkPermission(Permission.RemoveResourceFromCollection, ResourceRef(ResourceRef.collection, UUID(collectionId.get)))){
83-
<button onclick="confirmRemoveResourceFromResource('collection','collection','@collectionId.get','dataset','@(dataset.id)','@(dataset.name.replace("'","&#39;"))',true,'@redirect.url')"
84-
class="btn btn-link" title="Remove the dataset from the collection.">
85-
<span class="glyphicon glyphicon-remove"></span> Remove</button>
86-
} else {
87-
<div class="inline" title="No permission to remove dataset from the collection.">
88-
<button disabled class="btn btn-link"><span class="glyphicon glyphicon-remove"></span> Remove</button>
89-
</div>
90-
}
91-
} else {
92-
@if(user.get.id.equals(dataset.author.id) || Permission.checkPermission(Permission.DeleteDataset, ResourceRef(ResourceRef.dataset, dataset.id))){
93-
<button onclick="confirmDeleteResource('dataset','dataset','@(dataset.id)','@(dataset.name.replace("'","&#39;"))',false,'@redirect.url')"
94-
class="btn btn-link" title="Delete the dataset and its contents">
95-
<span class="glyphicon glyphicon-trash"></span> Delete</button>
96-
} else {
97-
<div class="inline" title="No permission to delete the dataset">
98-
<button disabled class="btn btn-link"><span class="glyphicon glyphicon-trash"></span> Delete</button>
99-
</div>
100-
}
101-
}
102-
}
10380
</div>
10481
</div>
10582
<div class="row">

app/views/datasets/tile.scala.html

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,6 @@ <h4><a href="@(routes.Datasets.dataset(dataset.id, space))">@Html(dataset.name)<
3333
<span class="glyphicon glyphicon-list" title="@(dataset.metadataCount) metadata fields"></span> @(dataset.metadataCount)
3434
<span class="glyphicon glyphicon-eye-open" title="@dataset.stats.views views"></span> @dataset.stats.views
3535
<span class="glyphicon glyphicon-circle-arrow-down" title="@dataset.stats.downloads downloads"></span> @dataset.stats.downloads
36-
@if(user.isDefined) {
37-
@if(space.isDefined) {
38-
39-
@if(user.get.id.equals(dataset.author.id) || Permission.checkPermission(Permission.RemoveResourceFromSpace, ResourceRef(ResourceRef.space,UUID(space.get)))) {
40-
<button onclick="confirmRemoveResourceFromResource('space','@Messages("space.title")','@(UUID(space.getOrElse("")))','dataset','@(dataset.id)','@(dataset.name.replace("'","&#39;"))',true,'@redirect.url')"
41-
class="btn btn-link" title="Remove the dataset from the @Messages("space.title")">
42-
<span class="glyphicon glyphicon-remove"></span></button>
43-
} else {
44-
<div class="inline" title="No permission to remove the dataset from the @Messages("space.title")">
45-
<button disabled class="btn btn-link"><span class="glyphicon glyphicon-remove"></span></button>
46-
</div>
47-
}
48-
49-
} else {
50-
@if(user.get.id.equals(dataset.author.id) || Permission.checkPermission(Permission.DeleteDataset, ResourceRef(ResourceRef.dataset, dataset.id))) {
51-
<button onclick="confirmDeleteResource('dataset','dataset','@(dataset.id)','@(dataset.name.replace("'","&#39;"))',false,'@redirect.url')" class="btn btn-link" title="Delete the dataset and its contents">
52-
<span class="glyphicon glyphicon-trash"></span></button>
53-
} else {
54-
<div class="inline" title="No permission to delete the dataset">
55-
<button disabled class="btn btn-link"><span class="glyphicon glyphicon-trash"></span></button>
56-
</div>
57-
}
58-
}
59-
}
6036
</li>
6137
</ul>
6238
@if(isFollowing){

0 commit comments

Comments
 (0)