From: Laurence Maultsby <laurence.maultsby@riftio.com>
Date: Thu, 19 Jan 2017 01:41:08 +0000 (-0500)
Subject: Merge branch 'master' into v1.1
X-Git-Tag: v1.1.0~17
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=d6d948e60162217694351891cb385498d5f2546e;hp=-c;p=osm%2FUI.git

Merge branch 'master' into v1.1

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
---

d6d948e60162217694351891cb385498d5f2546e
diff --combined skyquake/plugins/composer/api/composer.js
index dde9bcd54,a2355ab6a..13fd0ddba
--- a/skyquake/plugins/composer/api/composer.js
+++ b/skyquake/plugins/composer/api/composer.js
@@@ -272,36 -272,36 +272,36 @@@ Composer.create = function(req) 
          });
      });
  };
- // Composer.update = function(req) {
- //     var api_server = req.query['api_server'];
- //     var catalogType = req.params.catalogType;
- //     var id = req.params.id;
- //     var data = req.body;
- //     console.log('Updating', catalogType, 'id', id, 'on', api_server);
- //     var jsonData = {};
- //     jsonData[catalogType] = {};
- //     jsonData[catalogType] = data;
- //     return new Promise(function(resolve, reject) {
- //         var requestHeaders = {};
- //         _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
- //             'Authorization': req.get('Authorization')
- //         });
- //         request({
- //             uri: utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id,
- //             method: 'PUT',
- //             headers: requestHeaders,
- //             forever: constants.FOREVER_ON,
- //             rejectUnauthorized: false,
- //             json: jsonData
- //         }, function(error, response, body) {
- //             if (utils.validateResponse('Composer.update', error, response, body, resolve, reject)) {
- //                 resolve({
- //                     statusCode: response.statusCode
- //                 });
- //             }
- //         });
- //     });
- //
+ Composer.updateSave = function(req) {
+     var api_server = req.query['api_server'];
+     var catalogType = req.params.catalogType;
+     var id = req.params.id;
+     var data = req.body;
+     console.log('Updating', catalogType, 'id', id, 'on', api_server);
+     var jsonData = {};
+     jsonData[catalogType] = {};
+     jsonData[catalogType] = data;
+     return new Promise(function(resolve, reject) {
+         var requestHeaders = {};
+         _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
+             'Authorization': req.get('Authorization')
+         });
+         request({
+             uri: utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id,
+             method: 'PUT',
+             headers: requestHeaders,
+             forever: constants.FOREVER_ON,
+             rejectUnauthorized: false,
+             json: jsonData
+         }, function(error, response, body) {
+             if (utils.validateResponse('Composer.update', error, response, body, resolve, reject)) {
+                 resolve({
+                     statusCode: response.statusCode
+                 });
+             }
+         });
+     });
+ }
  
  Composer.update = function(req) {
      console.log(' Updating file', req.file.originalname, 'as', req.file.filename);
@@@ -312,7 -312,7 +312,7 @@@
      var download_host = req.query['dev_download_server'];
  
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
      var input = {
          'external-url': download_host + '/composer/update/' + req.file.filename,
@@@ -368,7 -368,7 +368,7 @@@ Composer.upload = function(req) 
      var download_host = req.query['dev_download_server'];
  
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
  
      return new Promise(function(resolve, reject) {
@@@ -425,7 -425,7 +425,7 @@@ Composer.addFile = function(req) 
      var package_type = req.query['package_type'].toUpperCase();
      var package_path = req.query['package_path'];
      if (!download_host) {
 -        download_host = req.protocol + '://' + req.headers.host;
 +        download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
      }
  
      return new Promise(function(resolve, reject) {