From 24d53a7c630f61e02ee1bea3befc04ff4adb45e9 Mon Sep 17 00:00:00 2001 From: KIRAN KASHALKAR Date: Thu, 20 Apr 2017 12:03:22 -0400 Subject: [PATCH] NOTICKET: Fix merge issues caused by tool Signed-off-by: KIRAN KASHALKAR --- skyquake/plugins/composer/api/composer.js | 8 ++++---- .../src/src/components/EditDescriptorModelProperties.js | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/skyquake/plugins/composer/api/composer.js b/skyquake/plugins/composer/api/composer.js index f2409d673..c8ac6a4df 100644 --- a/skyquake/plugins/composer/api/composer.js +++ b/skyquake/plugins/composer/api/composer.js @@ -479,7 +479,7 @@ PackageManager.copy = function(req) { uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }), forever: constants.FOREVER_ON, rejectUnauthorized: false, @@ -520,12 +520,12 @@ PackageManager.getJobStatus = function(req) { url: url, method: 'GET', headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }), forever: constants.FOREVER_ON, rejectUnauthorized: false }, function(error, response, body) { - if (utils.validateResponse('restconfAPI.streams', error, response, body, resolve, reject)) { + if (utils.validateResponse('PackageManager.getJobStatus', error, response, body, resolve, reject)) { var returnData; if (id) { returnData = JSON.parse(response.body)['rw-pkg-mgmt:job']; @@ -570,7 +570,7 @@ FileManager.addFile = function(req) { uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }), forever: constants.FOREVER_ON, rejectUnauthorized: false, diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js index abb94474d..c4b817eb4 100644 --- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js +++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js @@ -183,7 +183,6 @@ export default function EditDescriptorModelProperties(props) { let catalogs = cds.getTransientCatalogs(); const pathToProperty = path.join('.'); - const isEditable = true; const isGuid = Property.isGuid(property); const isBoolean = Property.isBoolean(property); const isEnumeration = Property.isEnumeration(property); -- 2.17.1