From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 9 Jan 2017 20:11:29 +0000 (-0500)
Subject: Revert bad merge change
X-Git-Tag: v1.1.0~24
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F898%2F1;p=osm%2FUI.git

Revert bad merge change

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---

diff --git a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js
index 690118d54..87afb6afa 100644
--- a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js
+++ b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js
@@ -49,7 +49,7 @@ function initializeDropZone(element = '#dropzone', button = false, action = ACTI
 			if (action === ACTIONS.update) {
 				return getCatalogPackageManagerServerOrigin() + '/api/update';
 			}
-			return getCatalogPackageManagerServerOrigin() + '/composer/upload?api_server=' + Utils.getSearchParams(window.location).api_server + '&upload_server=' + Utils.getSearchParams(window.location).upload_server + '&dev_download_server=' + Utils.getSearchParams(window.location).dev_download_server;
+			return getCatalogPackageManagerServerOrigin() + '/composer/upload?api_server=' + Utils.getSearchParams(window.location).api_server + '&upload_server=' + Utils.getSearchParams(window.location).upload_server + ( dev_download_server ? '&dev_download_server=' + dev_download_server : '');
 		},
 		headers: {
 			'Authorization': Auth