loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add auto update

Browse source
This commit is contained in:
Loic GUEGAN 2016-05-08 15:14:47 +02:00
parent 3b5d1e033a
commit c5e909da1b
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/js/controllers/home/home.js
View file

@ -5,7 +5,6 @@
*/ */
mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image) mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
{ {
graph = new joint.dia.Graph; graph = new joint.dia.Graph;
paper = new joint.dia.Paper({ paper = new joint.dia.Paper({
el: $('#graphHolder'), el: $('#graphHolder'),
@ -87,18 +86,14 @@ mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'I
var tryToRetrieveData = function () { var tryToRetrieveData = function () {
// If no data retrieve about machine and user is logged // If no data retrieve about machine and user is logged
if (Compute.getData().machines == null && Identity.isAlreadyLogin()) { if (Identity.isAlreadyLogin()) {
Loading.start(); // Show loading gif Loading.start(); // Show loading gif
Compute.pullData(callMeAfterPullData); // Retrieve data and call the callback Compute.pullData(callMeAfterPullData); // Retrieve data and call the callback
} else { }
// Else if user is logged and data is already retrieve
// simply display data
if (Identity.isAlreadyLogin()) {
callMeAfterPullData(); // Display data
}
}
}; };
tryToRetrieveData();
// On user login // On user login
$scope.$on('loginEvent', function () { $scope.$on('loginEvent', function () {
tryToRetrieveData(); tryToRetrieveData();

9
client/js/controllers/image/image.js
View file

@ -14,12 +14,9 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '$roo
// If user is login try to retrieve data // If user is login try to retrieve data
if (Identity.isAlreadyLogin()) { if (Identity.isAlreadyLogin()) {
if (Image.getData().images == null) { Loading.start();
Loading.start(); Image.getImages(callMeAfterGetImage);
Image.getImages(callMeAfterGetImage);
} else {
callMeAfterGetImage();
}
} }
// Manager logout event // Manager logout event