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

Error Correction

Browse source
This commit is contained in:
Eole 2016-05-04 20:07:11 +02:00
parent d24d569f1c
commit b2c76ddf0a
1 changed files with 1 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,51 +5,6 @@
*/
mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
{
// Function to call after pull all data about machines
var callMeAfterPullData=function(data){
//$scope.machines=Compute.getData().machines;
Loading.stop();
displayMachine();
};
var tryToRetrieveData = function () {
// If no data retrieve about machine and user is logged
if (Compute.getData().machines == null && Identity.isAlreadyLogin()) {
Loading.start(); // Show loading gif
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
}
}
};
// On user login
$scope.$on('loginEvent', function () {
tryToRetrieveData();
});
// Function to call from view to display the details of a machine
$scope.raiseShowMachineDetailsEvent = function (id) {
// Stop loading gif and display overlay
var callback = function () {
Loading.stop();
var data = Compute.getData();
$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);
};
Loading.start(); // Show loading gif
Compute.pullMachines(callback); // Retrieve machine info and display overlay
};
// Try to retrieve data for the first time
tryToRetrieveData();
var displayMachine = function(){
var machineNames = [];
var i = 0;
@ -203,9 +158,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
var width = 130;
var height = 80;
var data = Compute.getData();
//console.log(data.machines[vm[1]]);
if(data.machines[vm[1]].status == "ACTIVE"){
return new joint.shapes.org.Member({
id: vm[1],