projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14345-add-webdav-user-doc
[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 57b8d8780c6859e9063cabb7c43cfcb30a14d6bf..c4a801d68b0a645fe7c10de9cdee91f642ed4ab7 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-16,7
+16,8
@@
module ApplicationHelper
end
def render_markup(markup)
end
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
+44,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={})
@@
-426,18
+420,23
@@
module ApplicationHelper
lt
end
lt
end
- def get_cwl_
inputs
(workflow)
- if workflow[:
inputs]
- return workflow
[:inputs]
+ def get_cwl_
main
(workflow)
+ if workflow[:
"$graph"].nil?
+ return workflow
else
workflow[:"$graph"].each do |tool|
if tool[:id] == "#main"
else
workflow[:"$graph"].each do |tool|
if tool[:id] == "#main"
- return tool
[:inputs]
+ return tool
end
end
end
end
end
end
end
end
+ def get_cwl_inputs(workflow)
+ get_cwl_main(workflow)[:inputs]
+ end
+
+
def cwl_shortname(id)
if id[0] == "#"
id = id[1..-1]
def cwl_shortname(id)
if id[0] == "#"
id = id[1..-1]
@@
-675,9
+674,10
@@
module ApplicationHelper
end
# Keep locators are expected to be of the form \"...<pdh/file_path>\"
end
# Keep locators are expected to be of the form \"...<pdh/file_path>\"
- JSON_KEEP_LOCATOR_REGEXP = /(
.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*)
)/
+ JSON_KEEP_LOCATOR_REGEXP = /(
[0-9a-f]{32}\+\d+[^'"]*?)(?=['"]|\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