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 58ad619203bbc60f995f07e233f90ce507ec0708..0f60bcd65b64c5653385a65955e412d5e8607c60 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -670,15 +670,10 @@ module ApplicationHelper
     render_runtime duration, use_words, round_to_min
   end
 
-  # Keep locators in input mounts are of the form \"keep:<pdh/file_path>\"
-  MOUNT_INPUT_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
-  def mount_input_keep_locator str
-    MOUNT_INPUT_KEEP_LOCATOR_REGEXP.match str
-  end
-
-  KEEP_LOCATOR_REGEXP = /(.*)([0-9a-f]{32}\+\d+)(.*)/
-  def keep_locator str
-    KEEP_LOCATOR_REGEXP.match str
+  # Keep locators are expected to be of the form \"...<pdh/file_path>\"
+  JSON_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
+  def keep_locator_in_json str
+    JSON_KEEP_LOCATOR_REGEXP.match str
   end
 
 private