Correction Erreur

This commit is contained in:
EoleDev 2016-03-23 15:13:42 +01:00
parent d3fc2ab36c
commit 0dc17aa9ef
5 changed files with 10 additions and 7 deletions

View file

@ -44,7 +44,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
if(Identity.isAlreadyLogin()){
if(Compute.getData().machines == null{
if(Compute.getData().machines == null){
Loading.start();
Compute.pullData(callMeAfterPullData);
}

View file

@ -22,7 +22,7 @@ class App{
$this->tokenPost = NULL;
$this->tokenClass = new genTokenOptions($args);
$this->openstack = new OpenStack\OpenStack([]);
$this->openstack = new OpenStack\OpenStack(['authUrl' => $args["authUrl"]]);
$this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this);
$this->output = array();
@ -38,7 +38,7 @@ class App{
}
public function checkToken(){
$this->tokenClass->checkToken();
return $this->tokenClass->checkToken();
}
public function getLibClass($service){

View file

@ -492,6 +492,7 @@ class compute
}
return;
}
}
/**
* Resize a server
* A call to this method has to be followed by either confirmResize or revertResize

View file

@ -51,9 +51,9 @@ class genTokenOptions
}
public function checkToken(){
return $this->backup['time'] > time();
//error_log($this->backup['time'], 0);
//return $this->backup['time'] > time();
return true;
}
public function genIdentityToken(){
@ -307,6 +307,7 @@ class genTokenOptions
}
private function serializeToken($token){
global $config;
$tokenSerialized = [];
$tokenSerialized["token"]["methods"] = serialize($token->methods);
$tokenSerialized["roles"] = [];
@ -385,6 +386,7 @@ class genTokenOptions
$token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = [];
error_log(print_r($Saved["catalog"], true), 0);
foreach($Saved["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api);

View file

@ -55,7 +55,7 @@
}
}else{
$App->setOuptut("Error", "Token Invalide");
$App->setOutput("Error", "Token Invalide");
$App->show();
}