summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server/Test/imageTests.php9
-rw-r--r--server/core/Image.php8
2 files changed, 12 insertions, 5 deletions
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 1bb834b..a8f16ce 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -17,14 +17,17 @@ $opt['minRam'] = 10;
//$new_image = $image->createImage($opt);
//Liste des images
-$images = $image->action("listImage");
+$image->action("listImage");
//$images = $image->listImage();
+$im = $App->show();
+error_log(var_export(json_decode($im, true), true), 0);
+$images = json_decode($im, true)["Images"];
if(isset($images)){
echo "Images présentes :";
echo "</br>";
foreach($images as $i){
- echo $i->name;
- if($i->name == "Test"){
+ echo $i['name'];
+ if($i['name'] == "Test"){
$id_image = $i->id;
$list = $i->tags;
echo $i->status;
diff --git a/server/core/Image.php b/server/core/Image.php
index e341fe0..6bc2dbd 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -153,7 +153,11 @@ class image implements Core{
*/
private function listImage(){
try{
+ $result = array();
$l = $this->libClass->listImages();
+ foreach($l as $tmp)
+ $result[] = $tmp;
+ error_log(var_export($result, true), 0);
if(!isset($l)){ // if the list is empty there is no images
$this->app->setOutput("Error", "No image");
}
@@ -166,8 +170,8 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $l;
-
+ //return $l;
+ $this->app->setOutput("Images", $result);
}
/**