1 files changed, 18 insertions, 15 deletions
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index e298fcc..d0578d7 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,19 +3,22 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
-{
-	var callbackTest=function(){
-		$scope.images=Image.getData().images;
-				Loading.stop();
-	};
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
+    {
 
-	if(Image.getData().images==null){
-		Loading.start();
-		Image.getImages(callbackTest);
-	}
-	else{
-		callbackTest();
-	}
-	
-}]);
+        // Update view
+        var callMeAfterGetImage = function () {
+            $scope.images = Image.getData().images;
+            Loading.stop();
+        };
+
+        // If user is login try to retrieve data
+        if (Identity.isAlreadyLogin()) {
+            if (Image.getData().images == null) {
+                Loading.start();
+                Image.getImages(callMeAfterGetImage);
+            } else {
+                callMeAfterGetImage();
+            }
+        }
+    }]);