X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0dea965e36e7ac52a789e31b45fc70f1925c4190..575b2f04b80a8bb2cf5ab61ce80a94d5fe017aa3:/apps/workbench/app/controllers/collections_controller.rb diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index c3777962d0..dc9ed43c40 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -1,4 +1,5 @@ require "arvados/keep" +require "arvados/collection" require "uri" class CollectionsController < ApplicationController @@ -308,16 +309,39 @@ class CollectionsController < ApplicationController end end - def rename_selected_file - arv_coll = Arv::Collection.new(@object.manifest_text) - source_paths[uuids[0]].each do |p| - arv_coll.rename "./"+params[:src], "./"+params[:dst] - end + def update + updated_attr = params[:collection].each.select {|a| a[0].andand.start_with? 'rename-file-path:'} - if @object.update_attributes manifest_text: arv_coll.manifest_text - show + if updated_attr.size > 0 + # Is it file rename? + file_path = updated_attr[0][0].split('rename-file-path:')[-1] + + new_file_path = updated_attr[0][1] + if new_file_path.start_with?('./') + # looks good + elsif new_file_path.start_with?('/') + new_file_path = '.' + new_file_path + else + new_file_path = './' + new_file_path + end + + arv_coll = Arv::Collection.new(@object.manifest_text) + + if arv_coll.exist?(new_file_path) + @errors = 'Duplicate file path. Please use a different name.' + self.render_error status: 422 + else + arv_coll.rename "./"+file_path, new_file_path + + if @object.update_attributes manifest_text: arv_coll.manifest_text + show + else + self.render_error status: 422 + end + end else - self.render_error status: 422 + # Not a file rename; use default + super end end