diff options
| author |   Sébastien Determe <sebastien.determe@intl.att.com> | 2019-02-22 06:16:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-22 06:16:28 +0000 |
| commit | ea2a091eb8bd63fad838f45403e109caa5e43379 (patch) | |
| tree | b0c02a7872468fec0e75da09e1e0f2eee6361077 /src/main/resources | |
| parent | 51544c9833da4d51ce18ddd01d0cb23c84de27dc (diff) | |
| parent | 1885741f27d74104a34cadf1f4d9c73f82c4fcff (diff) | |
Merge "Fix the bugs"
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js | 2 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/rest/clds-services.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js index dc71fcd2f..f78ad1e6b 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js @@ -29,7 +29,7 @@ app.controller('ToscaModelCtrl', toscaModelService.getHpModelJsonByPolicyType(selectedPolicy).then(function(response) { $('#editor').empty(); - var toscaModel = JSON.parse(response.body.toscaModelJson); + var toscaModel = JSON.parse(response.toscaModelJson); if($scope.policyList && toscaModel.schema.properties && toscaModel.schema.properties.policyList){ toscaModel.schema.properties.policyList.enum = $scope.policyList; } diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml index e4c4f4cbc..7abffd35d 100644 --- a/src/main/resources/clds/camel/rest/clds-services.xml +++ b/src/main/resources/clds/camel/rest/clds-services.xml @@ -115,6 +115,7 @@ uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" /> </put> <get uri="/tosca/models/policyType/{policyType}" + outType="org.onap.clamp.clds.model.CldsToscaModel" produces="application/json"> <to uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" /> |