Merge branch 'loic' into develop

client/js/controllers/home/home.js

@@ -9,21 +9,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 	var callMeAfterPullData=function(data){
 		$scope.machines=Compute.getData().machines;
 		Loading.stop();
-	}
-
-	;
-	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
-		Loading.start();
-		Compute.pullData(callMeAfterPullData);		
-	}
-	else{
-		if(Identity.isAlreadyLogin()){
-			callMeAfterPullData();
-		}
-	}
-
-	
-	Image.getImages(function(){});
+	};
 	
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
@@ -39,4 +25,20 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 	}
 
 
+
+
+	
+	if(Identity.isAlreadyLogin()){
+		if(Compute.getData().machines == null{
+			Loading.start();
+			Compute.pullData(callMeAfterPullData);		
+		}
+		   else{
+			   if(Identity.isAlreadyLogin()){
+				   callMeAfterPullData();
+			   }
+		   }
+		   Image.getImages(function(){});
+		  }
+
 }]);

client/js/controllers/home/machineDetails.js

@@ -3,9 +3,10 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
+mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
 {
 
+
 	// Init scope
 	$scope.machine={};
 	$scope.machineIsStarting=false; // For loading icon

client/js/controllers/image/image.js

@@ -3,13 +3,20 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading',function ($scope, Image, Loading)
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
 {
+
 	var callbackTest=function(){
 		$scope.images=Image.getData().images;
 		Loading.stop();
 	};
 
+	$scope.doUpload = function () {
+		Image.uploadImage($scope.myFile,function(){});
+	};
+	
+	if(Identity.isAlreadyLogin()){
+
 		if(Image.getData().images==null){
 			Loading.start();
 			Image.getImages(callbackTest);
@@ -18,8 +25,5 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading',function ($scope,
 			callbackTest();
 		}
 
-	$scope.doUpload = function () {
-		Image.uploadImage($scope.myFile,function(){});
-	};
-	
+	}	
 }]);

client/js/controllers/status.js

@@ -9,6 +9,7 @@
 mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
 {
 
+	
 	// Give profile to model
     $scope.profile=Identity.getProfile();
 	

client/js/services/Identity.js

@@ -27,10 +27,13 @@ mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
 
+			if(token!==null){
 				// If yes, put it into variables
 				angular.extend(profile, profileInCookie);
 				token=tokenPart_0InCookie+tokenPart_1InCookie;
 				
+			}
+
 			// Return I'm Login
 			return true;
 		}