projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14322: Tweak JSON_KEEP_LOCATOR_REGEXP and comment
[arvados.git]
/
apps
/
workbench
/
app
/
helpers
/
application_helper.rb
diff --git
a/apps/workbench/app/helpers/application_helper.rb
b/apps/workbench/app/helpers/application_helper.rb
index 106716a0f72f178e826afc6eaaf2908ecb8afe0a..4c4b5ff34df52c471fa2ceaf566e8f9a5b606d02 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-15,8
+15,13
@@
module ApplicationHelper
Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,''
end
Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,''
end
+ def current_uuid_prefix
+ current_api_host[0..4]
+ end
+
def render_markup(markup)
def render_markup(markup)
- raw RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile) if markup
+ allowed_tags = Rails::Html::Sanitizer.white_list_sanitizer.allowed_tags + %w(table tbody th tr td col colgroup caption thead tfoot)
+ sanitize(raw(RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile)), tags: allowed_tags) if markup
end
def human_readable_bytes_html(n)
end
def human_readable_bytes_html(n)
@@
-43,13
+48,6
@@
module ApplicationHelper
end
return h(n)
end
return h(n)
- #raw = n.to_s
- #cooked = ''
- #while raw.length > 3
- # cooked = ',' + raw[-3..-1] + cooked
- # raw = raw[0..-4]
- #end
- #cooked = raw + cooked
end
def resource_class_for_uuid(attrvalue, opts={})
end
def resource_class_for_uuid(attrvalue, opts={})
@@
-497,11
+495,12
@@
module ApplicationHelper
chooser_title = "Choose a #{primary_type == 'Directory' ? 'dataset' : 'file'}:"
selection_param = object.class.to_s.underscore + dn
if attrvalue.is_a? Hash
chooser_title = "Choose a #{primary_type == 'Directory' ? 'dataset' : 'file'}:"
selection_param = object.class.to_s.underscore + dn
if attrvalue.is_a? Hash
- display_value = attrvalue[:"arv:collection"] || attrvalue[:location]
+ display_value = attrvalue[:"
http://arvados.org/cwl#collectionUUID"] || attrvalue[:"
arv:collection"] || attrvalue[:location]
re = CollectionsHelper.match_uuid_with_optional_filepath(display_value)
re = CollectionsHelper.match_uuid_with_optional_filepath(display_value)
+ locationre = CollectionsHelper.match(attrvalue[:location][5..-1])
if re
if re
- if re[4]
- display_value = "#{Collection.find(re[1]).name} / #{re[4][1..-1]}"
+ if
locationre and location
re[4]
+ display_value = "#{Collection.find(re[1]).name} / #{
location
re[4][1..-1]}"
else
display_value = Collection.find(re[1]).name
end
else
display_value = Collection.find(re[1]).name
end
@@
-679,10
+678,11
@@
module ApplicationHelper
render_runtime duration, use_words, round_to_min
end
render_runtime duration, use_words, round_to_min
end
- # Keep locators are expected to be of the form \"...<pdh/file_path>\"
- JSON_KEEP_LOCATOR_REGEXP = /(
.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*)
)/
+ # Keep locators are expected to be of the form \"...<pdh/file_path>\"
or \"...<uuid/file_path>\"
+ JSON_KEEP_LOCATOR_REGEXP = /(
[0-9a-f]{32}\+\d+[^'"]*|[a-z0-9]{5}-4zz18-[a-z0-9]{15}[^'"]*)(?=['"]|\z|$
)/
def keep_locator_in_json str
def keep_locator_in_json str
- JSON_KEEP_LOCATOR_REGEXP.match str
+ # Return a list of all matches
+ str.scan(JSON_KEEP_LOCATOR_REGEXP).flatten
end
private
end
private