Merge pull request #79 from grycap/devel

Devel
grycap · Nov 8, 2018 · 00ac7e1 · 00ac7e1
2 parents 643dfa1 + 42a7d10
commit 00ac7e1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/create_tar.sh b/create_tar.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.5.6
+VERSION=1.5.7
 
 if [ ! -d dist ]
 then

diff --git a/docker-ssl/Dockerfile b/docker-ssl/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM web GUI
 FROM php:apache
 MAINTAINER Miguel Caballer <micafer1@upv.es>
-LABEL version="1.5.6"
+LABEL version="1.5.7"
 LABEL description="Container image to run the IM web GUI. (http://www.grycap.upv.es/im)"
 
 ADD default-ssl.conf /etc/apache2/sites-enabled/

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM web GUI
 FROM php:apache
 MAINTAINER Miguel Caballer <micafer1@upv.es>
-LABEL version="1.5.6"
+LABEL version="1.5.7"
 LABEL description="Container image to run the IM web GUI. (http://www.grycap.upv.es/im)"
 
 RUN apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/*

diff --git a/list.php b/list.php
@@ -83,10 +83,10 @@
   <div id="main">
 
     <script type="text/javascript" charset="utf-8">
-        function confirm_delete(url, id) {
+        function confirm_delete(id) {
             var r=confirm("Sure that you want to delete the Infrastructure with id: " + id + "?");
             if (r==true) {
-                window.location.href = url;
+                window.location.href = 'operate.php?op=destroy&id=' + id;
             }
         }
 

diff --git a/list_json.php b/list_json.php
@@ -134,7 +134,7 @@
 		                	$text = $text . '"reconfigure":"N/A",';
 		                }
 
-		                $text = $text . '"delete": "<a onclick=\"javascript:confirm_delete(\'operate.php?op=destroy&id=' . $inf . '\', \'' . $inf . '\')\" href=\"#\"><img src=\"images/borrar.gif\" border=\"0\" alt=\"Delete\" title=\"Delete\"></a>",';
+		                $text = $text . '"delete": "<a onclick=\"javascript:confirm_delete(\'' . $inf . '\')\" href=\"#\"><img src=\"images/borrar.gif\" border=\"0\" alt=\"Delete\" title=\"Delete\"></a>",';
 		                $text = $text . '"addResources":"<a href=\"form.php?id=' . $inf . '?>\"><img src=\"images/add_resources_icon.png\" border=\"0\" alt=\"Add Resources\" title=\"Add Resources\"></a>"';
 
 

diff --git a/menu.php b/menu.php
@@ -29,7 +29,7 @@
 		<ul>
 			<li><a <?php if ($menu == "Infrastructures") echo 'class="seleccionado"'; ?> href='list.php'><span><img style="vertical-align: middle;" src="images/icon_infra.png" />&nbsp&nbspInfrastructures</span></a></li>
 			<li><a <?php if ($menu == "Credentials") echo 'class="seleccionado"'; ?> href='credentials.php'><span><img style="vertical-align: middle;" src="images/icon_creden.png" />&nbsp&nbspCredentials</span></a></li>
-			<li><a <?php if ($menu == "RADL") echo 'class="seleccionado"'; ?> href='radl_list.php'><span><img style="vertical-align: middle;" src="images/icon_radl.png" />&nbsp&nbspRADLs</span></a></li>
+			<li><a <?php if ($menu == "RADL") echo 'class="seleccionado"'; ?> href='radl_list.php'><span><img style="vertical-align: middle;" src="images/icon_radl.png" />&nbsp&nbspTopogies</span></a></li>
 	<?php
 	if ($recipes_db != "") {
 	?>			

diff --git a/test/unit/test_infpages.php b/test/unit/test_infpages.php
@@ -10,7 +10,7 @@ final class InfPagesTest extends TestCase
      */
     public function testInfList()
     {
-    	$expected_res = '{ "records": [{"id":"infid1","vms":"<a href=\'getvminfo.php?id=infid1&vmid=vmid1\' alt=\'VM Info\' title=\'VM Info\'>vmid1<br><a href=\'getvminfo.php?id=infid1&vmid=vmid2\' alt=\'VM Info\' title=\'VM Info\'>vmid2<br>","outputs":"<a href=\"getoutputs.php?id=infid1\">Show</a>","cont.Message":"<a href=\"getcontmsg.php?id=infid1\">Show</a>","status":"<span style=\'color:green\'>configuring</span>","reconfigure":"N/A","delete": "<a onclick=\"javascript:confirm_delete(\'operate.php?op=destroy&id=infid1\', \'infid1\')\" href=\"#\"><img src=\"images/borrar.gif\" border=\"0\" alt=\"Delete\" title=\"Delete\"></a>","addResources":"<a href=\"form.php?id=infid1?>\"><img src=\"images/add_resources_icon.png\" border=\"0\" alt=\"Add Resources\" title=\"Add Resources\"></a>"}], "queryRecordCount": 1, "totalRecordCount": 1}';
+    	$expected_res = '{ "records": [{"id":"infid1","vms":"<a href=\'getvminfo.php?id=infid1&vmid=vmid1\' alt=\'VM Info\' title=\'VM Info\'>vmid1<br><a href=\'getvminfo.php?id=infid1&vmid=vmid2\' alt=\'VM Info\' title=\'VM Info\'>vmid2<br>","outputs":"<a href=\"getoutputs.php?id=infid1\">Show</a>","cont.Message":"<a href=\"getcontmsg.php?id=infid1\">Show</a>","status":"<span style=\'color:green\'>configuring</span>","reconfigure":"N/A","delete": "<a onclick=\"javascript:confirm_delete(\'infid1\')\" href=\"#\"><img src=\"images/borrar.gif\" border=\"0\" alt=\"Delete\" title=\"Delete\"></a>","addResources":"<a href=\"form.php?id=infid1?>\"><img src=\"images/add_resources_icon.png\" border=\"0\" alt=\"Add Resources\" title=\"Add Resources\"></a>"}], "queryRecordCount": 1, "totalRecordCount": 1}';
    		$this->expectOutputString($expected_res);
         #$this->expectOutputRegex('/.*infid1.*/');
         #$this->expectOutputRegex("/.*style='color:green'>configuring.*/");