Menu no longer dismisses when clicking a checkbox to remove an item.
Selected files no longer have /./ in the middle.
Fixed nil error when non-file or non-collection items are in the selection list.
Fixed head_kind and tail_kind.
Made a comment about inline x-editable.
$.fn.editable.defaults.ajaxOptions = {type: 'put', dataType: 'json'};
$.fn.editable.defaults.send = 'always';
+
+// Default for editing is popup. I experimented with inline which is a little
+// nicer in that it shows up right under the mouse instead of nearby. However,
+// the inline box is taller than the regular content, which causes the page
+// layout to shift unless we make the table rows tall, which leaves a lot of
+// wasted space when not editing. Also inline can get cut off if the page is
+// too narrow, when the popup box will just move to do the right thing.
//$.fn.editable.defaults.mode = 'inline';
+
$.fn.editable.defaults.params = function (params) {
var a = {};
var key = params.pk.key;
var lst = get_selection_list();
$("#persistent-selection-count").text(lst.length);
if (lst.length > 0) {
- $('#selection-form-content').html('<li><input type="submit" name="combine_selected_files_into_collection" id="combine_selected_files_into_collection" value="Combine selected collections and files into a new collection"/></li>'
- + '<li><a href="#" id="clear_selections_button">Clear selections</a></li>'
- + '<li class="notification"><table style="width: 100%"></table></li>');
+ $('#selection-form-content').html(
+ '<li><a href="#" id="clear_selections_button">Clear selections</a></li>'
+ + '<li><input type="submit" name="combine_selected_files_into_collection" '
+ + ' id="combine_selected_files_into_collection" '
+ + ' value="Combine selected collections and files into a new collection" /></li>'
+ + '<li class="notification"><table style="width: 100%"></table></li>');
for (var i = 0; i < lst.length; i++) {
$('#selection-form-content > li > table').append("<tr>"
+ "<td>"
- + "<input class='remove-selection' name='selection[]' type='checkbox' value='" + lst[i].uuid + "' checked='true'></input>"
+ + "<input class='remove-selection' name='selection[]' type='checkbox' value='" + lst[i].uuid + "' checked='true' data-stoppropagation='true' />"
+ "</td>"
+ "<td>"
$(window).on('load storage', update_count);
+
+ $('#selection-form-content').on("click", function(e) {
+ e.stopPropagation();
+ });
});
add_form_selection_sources = null;
overflow-y: auto;
}
-#persistent-selection-list {
- width: 500px;
-}
-
-#persistent-selection-list li table tr {
- border-top: 1px solid rgb(221, 221, 221);
-}
class ActionsController < ApplicationController
+
+ skip_before_filter :find_object_by_uuid, only: :post
+
def combine_selected_files_into_collection
lst = []
files = []
params["selection"].each do |s|
m = CollectionsHelper.match(s)
- if m[1] and m[2]
+ if m and m[1] and m[2]
lst.append(m[1] + m[2])
files.append(m)
end
chash.each do |k,v|
l = Link.new({
- tail_kind: "arvados#Collection",
+ tail_kind: "arvados#collection",
tail_uuid: k,
- head_kind: "arvados#Collection",
+ head_kind: "arvados#collection",
head_uuid: newuuid,
link_class: "provenance",
name: "provided"
l.save!
end
- '/collections/' + newc.uuid
+ redirect_to controller: 'collections', action: :show, id: newc.uuid
end
def post
if params["combine_selected_files_into_collection"]
- redirect_to combine_selected_files_into_collection
+ combine_selected_files_into_collection
else
redirect_to :back
end
around_filter :thread_clear
around_filter :thread_with_mandatory_api_token, :except => [:render_exception, :render_not_found]
around_filter :thread_with_optional_api_token
- before_filter :find_object_by_uuid, :except => [:index, :post, :render_exception, :render_not_found]
+ before_filter :find_object_by_uuid, :except => [:index, :render_exception, :render_not_found]
before_filter :check_user_agreements, :except => [:render_exception, :render_not_found]
before_filter :check_user_notifications, :except => [:render_exception, :render_not_found]
theme :select_theme
$arvados_api_client.api "collections/#{self.uuid}/", "used_by"
end
- # def selection_label
- # name = ''
- # i = 0
- # if self.files.length > 3
- # m = 3
- # else
- # m = self.files.length
- # end
- # while i < m
- # name += "#{self.files[i][1]}"
- # i += 1
- # name += ", " if i < m
- # end
- # if i < self.files.length
- # name += "&ellip;"
- # end
- # name
- # end
end
</tr>
</thead><tbody>
<% if @object then @object.files.sort_by{|f|[f[0],f[1]]}.each do |file| %>
- <% file_path = "#{file[0]}/#{file[1]}" %>
- <tr>
- <td>
- <%= check_box_tag 'uuids[]', @object.uuid+'/'+file_path, false, {
- :class => 'persistent-selection',
- :friendly_type => "File",
- :friendly_name => "#{@object.uuid}/#{file_path}",
- :href => "#{url_for controller: 'collections', action: 'show', id: @object.uuid }/#{file_path}"
- } %>
- </td>
- <td>
- <%= file[0] %>
- </td>
+ <% f0 = file[0] %>
+ <% f0 = '' if f0 == '.' %>
+ <% f0 = f0[2..-1] if f0[0..1] == './' %>
+ <% f0 += '/' if not f0.empty? %>
+ <% file_path = "#{f0}#{file[1]}" %>
+ <tr>
+ <td>
+ <%= check_box_tag 'uuids[]', @object.uuid+'/'+file_path, false, {
+ :class => 'persistent-selection',
+ :friendly_type => "File",
+ :friendly_name => "#{@object.uuid}/#{file_path}",
+ :href => "#{url_for controller: 'collections', action: 'show', id: @object.uuid }/#{file_path}"
+ } %>
+ </td>
+ <td>
+ <%= file[0] %>
+ </td>
- <td>
- <%= link_to file[1], {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {title: 'View in browser'} %>
- </td>
+ <td>
+ <%= link_to file[1], {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {title: 'View in browser'} %>
+ </td>
- <td style="text-align:right">
- <%= raw(human_readable_bytes_html(file[2])) %>
- </td>
+ <td style="text-align:right">
+ <%= raw(human_readable_bytes_html(file[2])) %>
+ </td>
- <td>
- <div style="display:inline-block">
- <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'btn btn-info btn-sm', title: 'Download'} %>
- </div>
- </td>
- </tr>
+ <td>
+
<div style="display:inline-block">
+ <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'btn btn-info btn-sm', title: 'Download'} %>
+ </div>
+ </td>
+ </tr>
<% end; end %>
</tbody>
</table>
projects / arvados.git / commitdiff