X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ca521bb33e933aa097e855897ec960fc72e4d497..4013f2bd35cf76d92aeafc4d3b0b4e2fd7a2dd84:/apps/workbench/app/helpers/application_helper.rb?ds=inline diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb index 8c80a646ee..4c4b5ff34d 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -678,8 +678,8 @@ module ApplicationHelper render_runtime duration, use_words, round_to_min end - # Keep locators are expected to be of the form \"...\" - JSON_KEEP_LOCATOR_REGEXP = /([0-9a-f]{32}\+\d+[^'"]*?|[a-z0-9]{5}-4zz18-[a-z0-9]{15})(?=['"]|\z|$)/ + # Keep locators are expected to be of the form \"...\" or \"...\" + 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 # Return a list of all matches str.scan(JSON_KEEP_LOCATOR_REGEXP).flatten