diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-04-20 13:20:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2017-04-20 13:20:46 +0000 |
| commit | ee1b2408e237eb8127561b24c43ed8c7a64c789b (patch) | |
| tree | e434ac8a903fb0fd704b1960a81a81766a0ec065 | |
| parent | e03a0fb5619073f2b2864062afc490153c4987ad (diff) | |
| parent | 6496c7b9e9fd9131fd100268f28b8e8a6cffb0f6 (diff) | |
Merge "VNF Market place issues fix"
3 files changed, 8 insertions, 5 deletions
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js index 95da6bf7..466ab412 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetailsCtrl.js @@ -46,7 +46,8 @@ }
vm.service = $stateParams.serviceDetails;
- vm.service.funcTestReportUrl = baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + vm.service.report;
+ //ses vm.service.funcTestReportUrl = baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + vm.service.report;
+ vm.service.funcTestReportUrl = vm.service.report;
vm.downloadService = function(csarId) {
homeService.updateDownloadCount(csarId).then(function(response){
diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/config/baseUrlConfig.js b/vnfmarket/src/main/webapp/vnfmarket/common/config/baseUrlConfig.js index c4836889..72b9f5a9 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/config/baseUrlConfig.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/config/baseUrlConfig.js @@ -28,8 +28,8 @@ .module('vnfmarket')
.constant("baseUrlConfig", {
"common": {
- "ip" : "http://127.0.0.1",
- "port" : "8080"
+ "ip" : "", //ses
+ "port" : "" //ses
}
})
})();
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js index 51b64348..3141a1f4 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js @@ -39,7 +39,8 @@ var defer = $q.defer()
$http({
method: method,
- url: baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + url,
+ //ses url: baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + url,
+ url:url,
data: data,
headers: headers
}).then(function successCallback(response) {
@@ -73,7 +74,8 @@ var defer = $q.defer()
$http({
method: method,
- url: baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + url,
+ //ses url: baseUrlConfig.common.ip + ":" + baseUrlConfig.common.port + url,
+ url:url,
data: data,
headers: headers,
transformRequest: angular.identity,
|