From 2f83263d2978918561355b5b3b2bdaa05b38023f Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Wed, 22 Nov 2017 18:34:54 -0300 Subject: [PATCH] 12519: Remove trailing slash when guessing the workbench url. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- apps/workbench/app/assets/javascripts/models/session_db.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/workbench/app/assets/javascripts/models/session_db.js b/apps/workbench/app/assets/javascripts/models/session_db.js index 01b0d72728..ad9ad18784 100644 --- a/apps/workbench/app/assets/javascripts/models/session_db.js +++ b/apps/workbench/app/assets/javascripts/models/session_db.js @@ -135,7 +135,9 @@ window.SessionDB = function() { // the host part of apihostport is an IPv4 or [IPv6] // address. if (!session.baseURL.match('://(\\[|\\d+\\.\\d+\\.\\d+\\.\\d+[:/])')) - return session.baseURL.replace('://', '://workbench.') + var wbUrl = session.baseURL.replace('://', '://workbench.') + // Remove the trailing slash, if it's there. + return wbUrl.slice(-1) == '/' ? wbUrl.slice(0, -1) : wbUrl return null }, // Return a m.stream that will get fulfilled with the -- 2.30.2