toaster: importlayer Update property names for importlayer api calls

PATCH New Ed Bartosh 1 participant 1 message Oct 14, 2015

Share & tools

Ed Bartosh

author

2015-10-14 11:10 UTC #0 lore raw

PATCH 1/1 toaster: importlayer Update property names for importlayer api calls

Update the property names used in checking for existing layers. The server side API changed but not all references were updated.

[YOCTO #8300]

Signed-off-by Michael Wood <[email protected]>

Signed-off-by Ed Bartosh <[email protected]>

---
 bitbake/lib/toaster/toastergui/static/js/importlayer.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

index 2fadbc0..c68f366 100644
@@ -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.layer__vcs_url);
-    dupLayerInfo.find("#dup-layer-revision").text(layer.revision.commit);
+    dupLayerInfo.find("#dup-layer-vcs-url").text(layer.vcs_url);
+    dupLayerInfo.find("#dup-layer-revision").text(layer.vcs_reference);
 
     $(".fields-apart-from-layer-name").fadeOut(function(){

@@ -214,11 +214,10 @@ function importLayerPageInit (ctx) {
       $.getJSON(libtoaster.ctx.layersTypeAheadUrl,
         { include_added: "true" , search: name, format: "json" },
         function(layer) {
-          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]);
+          if (layer.results.length > 0) {
+            for (var i in layer.results){
+              if (layer.results[i].name == name) {
+                layerExistsError(layer.results[i]);
               }
             }
           }

Signature · 1 line

2.1.4