a5bc9c34399b3646a0d8e077fe2b6ed0f6ed0c44 chmalee Wed Mar 18 09:52:15 2020 -0700 Fixing broken redirect from hgHubConnect to hgTracks, refs #24559 diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c index 18874e3..74cb832 100644 --- src/hg/hgHubConnect/hgHubConnect.c +++ src/hg/hgHubConnect/hgHubConnect.c @@ -488,31 +488,31 @@ " document.validateHubForm.elements['validateHubUrl'].value=validateText.value;" " document.validateHubForm.elements['" hgHubDoHubCheck "'].value='on';" " if (doMeasureTiming) { document.validateHubForm.elements['measureTiming'].value='1'; }" " else { document.validateHubForm.elements['measureTiming'].value=''}" " if (udcTimeout) { document.validateHubForm.elements['udcTimeout'].value='1'; }" " else { document.validateHubForm.elements['udcTimeout'].value=''}" " document.validateHubForm.submit(); return true; }" "else { return false; }" ); jsOnEventById("click", "hubLoadMaybeTiming", "var validateText = document.getElementById('validateHubUrl');" "var udcTimeout = document.getElementById('disableUdcTimeout').checked === true;" "var doMeasureTiming = document.getElementById('addMeasureTiming').checked === true;" "validateText.value=$.trim(validateText.value);" "if(validateUrl($('#validateHubUrl').val())) {" - " loc = \"../cgi-bin/hgTracks?&hgHub_do_firstDb=on\" + \"&hubUrl=\" + validateText.value;" + " loc = \"../cgi-bin/hgTracks?hgHub_do_firstDb=on&hgHub_do_redirect=on&hgHubConnect.remakeTrackHub=on\" + \"&hubUrl=\" + validateText.value;" " if (doMeasureTiming) { loc += \"&measureTiming=1\";} else { loc += \"&measureTiming=[]\"; }" " if (udcTimeout) { loc += \"&udcTimeout=5\"; } else { loc += \"&udcTimeout=[]\"; }" " window.location.href=loc; " "} else { return false; }" ); } static void addPublicHubsToHubStatus(struct sqlConnection *conn, char *publicTable, char *statusTable) /* Add urls in the hubPublic table to the hubStatus table if they aren't there already */ { char query[1024]; sqlSafef(query, sizeof(query), "select %s.hubUrl from %s left join %s on %s.hubUrl = %s.hubUrl where %s.hubUrl is NULL", publicTable, publicTable, statusTable, publicTable, statusTable, statusTable); struct sqlResult *sr = sqlGetResult(conn, query);