11684: Merge branch 'master' into 11684-unsigned-locator-fix

[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 db6ae38c84371b6074bc7f7a7a9ec4b69172adfc..0f60bcd65b64c5653385a65955e412d5e8607c60 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -671,9 +671,9 @@ module ApplicationHelper
   end
 
   # Keep locators are expected to be of the form \"...<pdh/file_path>\"
-  KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
+  JSON_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
   def keep_locator_in_json str
-    KEEP_LOCATOR_REGEXP.match str
+    JSON_KEEP_LOCATOR_REGEXP.match str
   end
 
 private