projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14988: Fixes functionals tests (WIP)
[arvados.git]
/
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 dcd47e1414d275a4071a532ddc4527356a2fac7c..8d7e6ee332af5e3cf53dac674e6185626f43d413 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-9,17
+9,17
@@
require "uri"
class CollectionsController < ApplicationController
include ActionController::Live
class CollectionsController < ApplicationController
include ActionController::Live
- skip_around_
filter
:require_thread_api_token, if: proc { |ctrl|
+ skip_around_
action
:require_thread_api_token, if: proc { |ctrl|
Rails.configuration.anonymous_user_token and
'show' == ctrl.action_name
}
Rails.configuration.anonymous_user_token and
'show' == ctrl.action_name
}
- skip_around_
filter
(:require_thread_api_token,
+ skip_around_
action
(:require_thread_api_token,
only: [:show_file, :show_file_links])
only: [:show_file, :show_file_links])
- skip_before_
filter
(:find_object_by_uuid,
+ skip_before_
action
(:find_object_by_uuid,
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
only: [:provenance, :show_file, :show_file_links])
# We depend on show_file to display the user agreement:
- skip_before_
filter
:check_user_agreements, only: :show_file
- skip_before_
filter
:check_user_profile, only: :show_file
+ skip_before_
action
:check_user_agreements, only: :show_file
+ skip_before_
action
:check_user_profile, only: :show_file
RELATION_LIMIT = 5
RELATION_LIMIT = 5
@@
-234,11
+234,7
@@
class CollectionsController < ApplicationController
def download_link
token = @search_sharing.first.api_token
def download_link
token = @search_sharing.first.api_token
- if Rails.configuration.keep_web_url || Rails.configuration.keep_web_download_url
- keep_web_url(@object.uuid, nil, {path_token: token})
- else
- collections_url + "/download/#{@object.uuid}/#{token}/"
- end
+ keep_web_url(@object.uuid, nil, {path_token: token})
end
def share
end
def share
@@
-269,7
+265,7
@@
class CollectionsController < ApplicationController
end
def update
end
def update
- updated_attr = params[:collection].each.select {|a| a[0].andand.start_with? 'rename-file-path:'}
+ updated_attr = params[:collection].
to_unsafe_hash.
each.select {|a| a[0].andand.start_with? 'rename-file-path:'}
if updated_attr.size > 0
# Is it file rename?
if updated_attr.size > 0
# Is it file rename?
@@
-304,30
+300,6
@@
class CollectionsController < ApplicationController
end
end
end
end
- def tags
- render
- end
-
- def save_tags
- tags_param = params['tag_data']
- if tags_param
- if tags_param.is_a?(String) && tags_param == "empty"
- tags = {}
- else
- tags = tags_param
- end
- end
-
- if tags
- if @object.update_attributes properties: tags
- @saved_tags = true
- render
- else
- self.render_error status: 422
- end
- end
- end
-
protected
def find_usable_token(token_list)
protected
def find_usable_token(token_list)