Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / portal / static / js / myslice.js

diff --git a/portal/static/js/myslice.js b/portal/static/js/myslice.js
index 2caa4b8..fa115be 100644 (file)
--- a/portal/static/js/myslice.js
+++ b/portal/static/js/myslice.js
@@ -138,38 +138,39 @@ var myslice = {
     },
     
     apply: function() {
-       $('div#loading').show();
-       this.pending = [];
-       this.save();
-       // setTimeout(function(){
-               // $('div#loading').hide();
-               // window.location.href = '/resources/' + this.slice + '?message=true';
-               // },6000);
+
+       //$('div#loading').show();
+       //this.pending = [];
+       //this.save();
+       //setTimeout(function(){
+               //$('div#loading').hide();
+               //window.location.href = '/resources/' + this.slice + '?message=true';
+               //},6000);
        
         
 
-       $.post("/rest/slice/", { 'fields': ['resource','slice_hrn'], 'filters': { 'slice_hrn' : this.slice  } }, function(data) {
-               console.log(data);
-               resources = [];
-               reserved = [];
-               update = [];
-               if ('resource' in data[0]) {
-                       $.each(data[0].resource, function(idx, r) {
-                               resources.push(r.urn);
-                       });
-               }
-               //myslice.pending
-               console.log(myslice.pending);
-               console.log(resources);
-               $.each(resources.concat(myslice.pending), function(idx, v) {
-                       update.push({ 'resource': v });
-               });
-               console.log(update);
-               $.post("/update/slice/", { 'filters': { 'slice_hrn' : 'ple.upmc.myslicedemo'  }, 'params' : update }, function(data) {
-                       console.log(data);
-               });
-       });
-       //console.log(this.slice);
+        $.post("/rest/slice/", { 'fields': ['resource','slice_hrn'], 'filters': { 'slice_hrn' : this.slice  } }, function(data) {
+                console.log(data);
+                resources = [];
+                reserved = [];
+                update = [];
+                if ('resource' in data[0]) {
+                        $.each(data[0].resource, function(idx, r) {
+                                resources.push(r.urn);
+                        });
+                }
+                //myslice.pending
+                console.log(myslice.pending);
+                console.log(resources);
+                $.each(resources.concat(myslice.pending), function(idx, v) {
+                        update.push( v );
+                });
+                console.log(update);
+                $.post("/update/slice/", { 'filters': { 'slice_hrn' : myslice.slice  }, 'params' : update }, function(data) {
+                        console.log(data);
+                });
+        });
+       console.log(this.slice);
     }
     
 };