From 3454c71f0523bd6957e10873d0b95bc191b2f283 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 14:42:50 +0100
Subject: Test request

---
 client/js/controllers/home/home.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'client/js/controllers/home')

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index f84f625..18133fa 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
 {
 
 	var callMeAfterPullData=function(data){
@@ -17,7 +17,8 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 		Compute.pullData(callMeAfterPullData);		
 	}
 
-
+	
+	Image.getImages(function(){});
 
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
-- 
cgit v1.2.3


From 3b569b6d008d5b1936ee04948cf5c1cc08790f39 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 15:10:34 +0100
Subject: Make some test

---
 client/js/controllers/home/home.js   |  5 +++++
 client/js/controllers/image/image.js | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'client/js/controllers/home')

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 18133fa..4402e62 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -16,6 +16,11 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 		Loading.start();
 		Compute.pullData(callMeAfterPullData);		
 	}
+	else{
+		if(Identity.isAlreadyLogin()){
+			callMeAfterPullData();
+		}
+	}
 
 	
 	Image.getImages(function(){});
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index a8346b3..e298fcc 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,11 +3,19 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', function ($scope, Image)
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
 {
 	var callbackTest=function(){
 		$scope.images=Image.getData().images;
+				Loading.stop();
 	};
 
-	Image.getImages(callbackTest);
+	if(Image.getData().images==null){
+		Loading.start();
+		Image.getImages(callbackTest);
+	}
+	else{
+		callbackTest();
+	}
+	
 }]);
-- 
cgit v1.2.3