[ARVADOS] updated: dff161c1eaaecd6b557e88709fdf5f0dcb52821b

git at public.curoverse.com git at public.curoverse.com
Wed Nov 12 21:19:17 EST 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/select_modal.js     | 6 +++---
 apps/workbench/app/views/collections/_show_files.html.erb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  dff161c1eaaecd6b557e88709fdf5f0dcb52821b (commit)
      from  a0e70cf1da033f7d94e728ab919bd8cfcabf3743 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit dff161c1eaaecd6b557e88709fdf5f0dcb52821b
Author: radhika <radhika at curoverse.com>
Date:   Wed Nov 12 21:19:01 2014 -0500

    3177: file selection

diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index 160e8de..bd68bc8 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -55,11 +55,11 @@ $(document).on('click', '.selectable', function() {
     $modal.find('.modal-error').removeClass('hide').hide();
 
     var $preview_selections = $modal.find('.preview-selectable.active');
-    if ($preview_selections) {
-      data.push({name: selection_param, value: $preview_selections.first().children('fa-file').prop('title')});
+    if ($preview_selections.length > 0) {
+      data.push({name: selection_param, value: $preview_selections.first().attr('href')});
     }
 
-    if (data.length == 0) {   // no preview selection option
+    if (data.length == 0) {   // not using preview selection option
       $modal.find('.selectable.active[data-object-uuid]').each(function() {
         var val = $(this).attr('data-object-uuid');
         data.push({name: selection_param, value: val});
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 4c3782f..8af66ad 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -78,7 +78,7 @@ function unselect_all_files() {
     <% else %>
       <% link_params = {controller: 'collections', action: 'show_file',
                         uuid: @object.portable_data_hash, file: file_path, size: size} %>
-       <div class="collection_files_row filterable <%=preview_selectable%>">
+       <div class="collection_files_row filterable <%=preview_selectable%>" href="<%=@object.uuid%>/<%=file_path%>">
         <div class="collection_files_buttons pull-right">
           <%= raw(human_readable_bytes_html(size)) %>
           <% disable_search = (Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1]) ? false : true %>

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list