Просмотр исходного кода

toastergui: Fix Duplicate layer importlayer api calls

As the JSON response changed the duplicate layer functionality wasn't
wasn't working as the field names in the returned data changed. This
patch brings the field names back in sync with the response.

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Michael Wood 8 лет назад
Родитель
Сommit
bdea86ae87
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      lib/toaster/toastergui/static/js/importlayer.js

+ 7 - 7
lib/toaster/toastergui/static/js/importlayer.js

@@ -195,8 +195,8 @@ function importLayerPageInit (ctx) {
     var dupLayerInfo = $("#duplicate-layer-info");
     dupLayerInfo.find(".dup-layer-name").text(layer.name);
     dupLayerInfo.find(".dup-layer-link").attr("href", layer.layerdetailurl);
-    dupLayerInfo.find("#dup-layer-vcs-url").text(layer.giturl);
-    dupLayerInfo.find("#dup-layer-revision").text(layer.revision);
+    dupLayerInfo.find("#dup-layer-vcs-url").text(layer.layer__vcs_url);
+    dupLayerInfo.find("#dup-layer-revision").text(layer.revision.commit);
 
     $(".fields-apart-from-layer-name").fadeOut(function(){
 
@@ -214,11 +214,11 @@ function importLayerPageInit (ctx) {
       $.getJSON(libtoaster.ctx.projectLayersUrl,
         { include_added: "true" , search: name, format: "json" },
         function(layer) {
-          if (layer.list.length > 0) {
-            for (var i in layer.list){
-              if (layer.list[i].name == name) {
-                console.log(layer.list[i])
-                layerExistsError(layer.list[i]);
+          if (layer.rows.length > 0) {
+            for (var i in layer.rows){
+              if (layer.rows[i].name == name) {
+                console.log(layer.rows[i])
+                layerExistsError(layer.rows[i]);
               }
             }
           }