From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Thu, 20 Apr 2017 16:03:22 +0000 (-0400)
Subject: NOTICKET: Fix merge issues caused by tool
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=24d53a7c630f61e02ee1bea3befc04ff4adb45e9;p=osm%2FUI.git

NOTICKET: Fix merge issues caused by tool

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

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);