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

Merge branch 'develop'

Browse source
This commit is contained in:
EoleDev 2016-04-18 19:39:00 +02:00
commit eb38e10d6f
3 changed files with 236 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/core/Image.php
View file

@ -224,7 +224,6 @@ class image implements Core{
}
else{
try{
//vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
@ -276,8 +275,6 @@ class image implements Core{
* @return void
*/
private function deleteImage(){
// si protected = true, demander de le mettre a false
// vérifier existence image
$id = $this->app->getPostParam("id");
if(!isset($id)){
$this->app->setOutput("Error", "Image doesn't exist");
@ -357,7 +354,6 @@ class image implements Core{
else
{
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
@ -400,7 +396,6 @@ class image implements Core{
}
else{
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
@ -437,7 +432,6 @@ class image implements Core{
}
else{
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
@ -521,7 +515,6 @@ class image implements Core{
}
else{
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($image_id);
if($image == null){ // if the image don't exists -> error