Skip to content

Commit c1a2d3b

Browse files
committed
Change Mark All to Mark Visible and fix folder functionality
1 parent 0fb112b commit c1a2d3b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

app/views/datasets/filesAndFolders.scala.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
'<li><a onclick="showOnlyMarked();"><span class="glyphicon glyphicon-ok"/>&nbsp;Show Only Marked</a></li>' +
8989
'<li><a onclick="showAllFiles();"><span class="glyphicon glyphicon-ok"/>&nbsp;Show All Files</a></li>' +
9090
*@
91-
'<li><a onclick="markAllFiles();"><span class="glyphicon glyphicon-check"/>&nbsp;Mark All</a></li>' +
91+
'<li><a onclick="markVisibleFiles();"><span class="glyphicon glyphicon-check"/>&nbsp;Mark Visible</a></li>' +
9292
'<li><a onclick="downloadMarked();"><span class="glyphicon glyphicon-download-alt"/>&nbsp;Download</a></li>' +
9393
@if(play.api.Play.current.plugin[services.RabbitmqPlugin].isDefined) {
9494
'<li><a onclick="submitMarked();"><span class="glyphicon glyphicon-send"/>&nbsp;Submit</a></li>' +
@@ -105,7 +105,7 @@
105105
'<li><a onclick="showOnlyMarked();"><span class="glyphicon glyphicon-ok"/>&nbsp;Show Only Marked</a></li>' +
106106
'<li><a onclick="showAllFiles();"><span class="glyphicon glyphicon-ok"/>&nbsp;Show All Files</a></li>' +
107107
*@
108-
'<li><a onclick="markAllFiles();"><span class="glyphicon glyphicon-check"/>&nbsp;Mark All</a></li>' +
108+
'<li><a onclick="markVisibleFiles();"><span class="glyphicon glyphicon-check"/>&nbsp;Mark Visible</a></li>' +
109109
//'<li><a onclick="downloadMarked();"><span class="glyphicon glyphicon-download-alt"/>&nbsp;Download</a></li>' +
110110
//'<li><a onclick="submitMarked();"><span class="glyphicon glyphicon-send"/>&nbsp;Submit</a></li>' +
111111
//'<li><a onclick="confirmTagMarked();"><span class="glyphicon glyphicon-tag"/>&nbsp;Tag</a></li>' +
@@ -115,9 +115,8 @@
115115
}
116116
}
117117

118-
function markAllFiles() {
119-
var selected = "@{dataset.files.mkString(",")}";
120-
console.log(selected)
118+
function markVisibleFiles() {
119+
var selected = "@{fileList.map(f => f.id.stringify).mkString(",")}";
121120
$.cookie('[email protected]', selected);
122121
var fileUUIDs = selected.split(',');
123122
for (idx in fileUUIDs) {
@@ -331,7 +330,6 @@ <h4 class="modal-title">Tag All Marked Files</h4>
331330
$(document).ready(function() {
332331
$('.fileselect').click(function() {
333332
var file_id = $(this).data("id");
334-
335333
if ($("a[data-id='" + file_id + "'] span.glyphicon").hasClass('glyphicon-plus')) {
336334
addFileToMarked(file_id)
337335
} else {

0 commit comments

Comments
 (0)