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

Error / Conflict Correction

Browse source
This commit is contained in:
EoleDev 2016-03-15 23:45:19 +01:00
parent 85b5ebaa18
commit 11dc33c440
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/core/Compute.php Normal file → Executable file
View file

@ -269,7 +269,7 @@ class compute
$imageId = $this->app->getPostParam("imageId"); $imageId = $this->app->getPostParam("imageId");
$newName = $this->app->getPostParam("newName"); $newName = $this->app->getPostParam("newName");
$adminPass = $this->app->getPostParam("adminPass"); $adminPass = $this->app->getPostParam("adminPass");
if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){ if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) {
$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!"); $this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
return; return;
} }

13
server/core/Image.php Normal file → Executable file
View file

@ -70,12 +70,7 @@ class image implements Core{
* options for the image creation * options for the image creation
* *
**/ **/
<<<<<<< HEAD
private function createImage(array $opt){
=======
private function createImage(){ private function createImage(){
>>>>>>> develop
$opt = $this->app->getPostParam("opt"); $opt = $this->app->getPostParam("opt");
@ -408,15 +403,9 @@ class image implements Core{
* @param string $id * @param string $id
* identifier of the image * identifier of the image
**/ **/
<<<<<<< HEAD
private function downloadImage($id){
<<<<<<< HEAD
=======
=======
private function downloadImage(){ private function downloadImage(){
>>>>>>> develop
$id = $this->app->getPostParam("id"); $id = $this->app->getPostParam("id");
>>>>>>> develop
if(!isset($id)){ if(!isset($id)){
$this->app->setOutput("Error", "Incorrect parameter"); $this->app->setOutput("Error", "Incorrect parameter");
} }