Merge pull request #2719 from coreos-inc/v2.4.0-fixuri

Fix URI lib import in setup tool
This commit is contained in:
josephschorr 2017-06-22 16:18:14 -04:00 committed by GitHub
commit 972cae4897

View file

@ -1,3 +1,5 @@
import * as URI from 'urijs';
(function() { (function() {
/** /**
* The Setup page provides a nice GUI walkthrough experience for setting up Quay Enterprise. * The Setup page provides a nice GUI walkthrough experience for setting up Quay Enterprise.
@ -236,11 +238,10 @@
$scope.serializeDbUri = function(fields) { $scope.serializeDbUri = function(fields) {
if (!fields['server']) { return ''; } if (!fields['server']) { return ''; }
var uri = URI();
try { try {
if (!fields['server']) { return ''; } if (!fields['server']) { return ''; }
if (!fields['database']) { return ''; } if (!fields['database']) { return ''; }
var uri = URI();
uri = uri && uri.host(fields['server']); uri = uri && uri.host(fields['server']);
uri = uri && uri.protocol(fields['kind']); uri = uri && uri.protocol(fields['kind']);
uri = uri && uri.username(fields['username']); uri = uri && uri.username(fields['username']);