Merge branch 'loic' into develop

1 files changed, 14 insertions, 10 deletions

diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index d499acb..b0b162b 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,23 +3,27 @@
  * 
  * @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();
+		Loading.stop();
 	};
 
-	if(Image.getData().images==null){
-		Loading.start();
-		Image.getImages(callbackTest);
-	}
-	else{
-		callbackTest();
-	}
-
 	$scope.doUpload = function () {
 		Image.uploadImage($scope.myFile,function(){});
 	};
 	
+	if(Identity.isAlreadyLogin()){
+
+		if(Image.getData().images==null){
+			Loading.start();
+			Image.getImages(callbackTest);
+		}
+		else{
+			callbackTest();
+		}
+
+	}	
 }]);