Merge commit '237b627' into develop

1 files changed, 8 insertions, 2 deletions

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 36ddc16..2bf28d8 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -32,7 +32,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 		}
 		else if(failedToSendRequest){
-			requestParserResult.failReason="Failed to send request";
+			requestParserResult.failReason="Failed to send PullMachine request";
 		}
 		else{
 			requestParserResult.failReason="Error";
@@ -79,7 +79,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 			data.axioms.images=response.data.Images;
 		}
 		else if(failedToSendRequest){
-			requestParserResult.failReason="Failed to send request";
+			requestParserResult.failReason="Failed to send PullImage request";
 		}
 		else{
 			requestParserResult.failReason="Error";
@@ -101,8 +101,11 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 		// Wait and handle the response
         result.then(function (response){
+                            alert(Identity.getToken());
+
 			callback(parsePullImagesAnswer(response, false));
         },function(response){
+
 			callback(parsePullImagesAnswer(response, true));
         });
 	};
@@ -117,6 +120,9 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 			if(response.status==0){
 				pullMachines(callback);
 			}
+                        else{
+                            callback(response);
+                        }
 		}
 		pullImages(nextFunction);
 	}