1 files changed, 6 insertions, 7 deletions
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
index 8b4f890d2..602fa4908 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.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=========================================================
  */
@@ -50,8 +51,7 @@ function editContextAlbumForm_deleteContextAlbum(parent, name, version) {
 
 function editContextAlbumForm_viewContextAlbum(parent, name, version) {
     var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
-    ajax_get(requestURL, function(data) {
-        var contextAlbum = JSON.parse(data.messages.message[0]).apexContextAlbum;
+    ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
         // Get all contextSchemas too for album item schema
         var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
         var contextSchemas = new Array();
@@ -72,8 +72,7 @@ function editContextAlbumForm_viewContextAlbum(parent, name, version) {
 
 function editContextAlbumForm_editContextAlbum(formParent, name, version) {
     var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
-    ajax_get(requestURL, function(data) {
-        var contextAlbum = JSON.parse(data.messages.message[0]).apexContextAlbum;
+    ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
         // Get all contextSchemas too for album item schema
         var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
         var contextSchemas = new Array();