diff options
Diffstat (limited to 'client/js/controllers/home')
| -rwxr-xr-x[-rw-r--r--] | client/js/controllers/home/home.js | 19 | ||||
| -rw-r--r-- | client/js/controllers/home/machineDetails.js | 7 |
2 files changed, 22 insertions, 4 deletions
diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js index d20779b..3332a10 100644..100755 --- a/client/js/controllers/home/home.js +++ b/client/js/controllers/home/home.js @@ -8,7 +8,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I var callMeAfterPullData=function(data){ $scope.machines=Compute.getData().machines; - Loading.stop(); + Loading.stop(); } ; @@ -26,6 +26,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I Image.getImages(function(){}); + $scope.raiseShowMachineDetailsEvent=function(id){ var callback=function(){ @@ -39,4 +40,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(){}); + } + }]); diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js index c015eaa..371310b 100644 --- a/client/js/controllers/home/machineDetails.js +++ b/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 @@ -27,7 +28,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$ $scope.machineIsStarting=false; }, 3000); $timeout(function(){ - $scope.machine.online=!$scope.machine.online; + $scope.machine.online=!$scope.machine.online; }, 3000); @@ -37,7 +38,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$ $scope.applyModifications=function(){ //Todo } - + }]); |