Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop

1 files changed, 29 insertions, 0 deletions

diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
new file mode 100644
index 0000000..b0b162b
--- /dev/null
+++ b/client/js/controllers/image/image.js
@@ -0,0 +1,29 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+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);
+		}
+		else{
+			callbackTest();
+		}
+
+	}	
+}]);