diff options
author | 2020-03-31 16:55:48 +0800 | |
---|---|---|
committer | 2020-04-02 10:41:24 +0800 | |
commit | dde2033879d895d12a93150987b308c5b87e2ab8 (patch) | |
tree | a03505bdb57110c5c902a826c3e243eb626da42d /client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js | |
parent | 60944ec26d43e3c5376621a389852c434c9679e5 (diff) |
Fix UUID missing in policy editor
Issue-ID: POLICY-2445
Signed-off-by: huaxing <huaxing.jin@est.tech>
Change-Id: I7fda1961e95b1f18da6c0e22c7799195fc511443
Diffstat (limited to 'client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js')
-rw-r--r-- | client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js index 79985828d..93c672cb6 100644 --- a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js +++ b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -37,19 +38,17 @@ function editPolicyForm_deletePolicy(parent, name, version) { function editPolicyForm_viewPolicy(formParent, name, version) { // get the policy var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version; - ajax_get(requestURL, function(data) { - var policy = JSON.parse(data.messages.message[0]).apexPolicy; + ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) { editPolicyForm_editPolicy_inner(formParent, policy, "VIEW"); - }); + }, "policyKey"); } function editPolicyForm_editPolicy(formParent, name, version) { // get the policy var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version; - ajax_get(requestURL, function(data) { - var policy = JSON.parse(data.messages.message[0]).apexPolicy; + ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) { editPolicyForm_editPolicy_inner(formParent, policy, "EDIT"); - }); + }, "policyKey"); } function editPolicyForm_editPolicy_inner(formParent, policy, viewOrEdit) { |