summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/asistentes
diff options
context:
space:
mode:
authoralbertogp <albertogp@uma.es>2021-03-23 10:27:18 +0100
committeralbertogp <albertogp@uma.es>2021-05-03 16:51:48 +0200
commit6b2028bc3784303624ce3c947f3228381436557b (patch)
tree050f3ac6a36492e053640ab12cfb99a56d0052d0 /admin/WebConsole/asistentes
parent6747826c962cc3862446a4fb851858b5de196427 (diff)
"ID-824 Modificando comando setBootMode por bootOs"
Diffstat (limited to 'admin/WebConsole/asistentes')
-rw-r--r--admin/WebConsole/asistentes/AsistenteDeployImage.php32
-rw-r--r--admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php6
-rw-r--r--admin/WebConsole/asistentes/includes/capturaacciones.php2
-rw-r--r--admin/WebConsole/asistentes/includes/formularioacciones.php5
-rw-r--r--admin/WebConsole/asistentes/includes/opcionesacciones.php19
5 files changed, 56 insertions, 8 deletions
diff --git a/admin/WebConsole/asistentes/AsistenteDeployImage.php b/admin/WebConsole/asistentes/AsistenteDeployImage.php
index ddf38e67..e67472f3 100644
--- a/admin/WebConsole/asistentes/AsistenteDeployImage.php
+++ b/admin/WebConsole/asistentes/AsistenteDeployImage.php
@@ -47,12 +47,28 @@ if (!$cmd)
<?php echo '<SCRIPT language="javascript" src="../idiomas/javascripts/'.$idioma.'/comandos/ejecutarscripts_'.$idioma.'.js"></SCRIPT>'?>
<?php echo '<SCRIPT language="javascript" src="../idiomas/javascripts/'.$idioma.'/comandos/comunescomandos_'.$idioma.'.js"></SCRIPT>'?>
<?php echo '<SCRIPT language="javascript" src="../idiomas/javascripts/'.$idioma.'/asistentes_'.$idioma.'.js"></SCRIPT>'?>
-
+<!-- // agp ______________________________________ -->
+<script type="text/javascript">
+function MuestraInsires() {
+ element = document.getElementById("verinsires");
+ check = document.getElementById("check");
+ if (check.checked) {
+ element.style.display='';
+ }
+ else {
+ element.style.display='none';
+ }
+}
+</script>
+<!-- // agp ______________________________________ -->
</head>
<body>
<?php
+// agp ______________________________________
+include_once("./includes/FiltradoAmbito.php");
+//________________________________________________________________________________________________________
# ambito: 4->aulas 16->ordenadores
# idambito: id de los elementos en su correspondiente tabla-ambito (aulas, ordenadores...)
# nombreambito: nombre del elemento.
@@ -70,7 +86,13 @@ switch($ambito){
$urlimg='../images/iconos/aula.gif';
$textambito=$TbMsg[2];
if (isset($_GET["idambito"])) $idambito=$_GET["idambito"];
- if (isset($_GET["litambito"])) $litambito=$_GET["litambito"];
+ if (isset($_GET["litambito"])) $litambito=$_GET["litambito"];
+ // agp ______________________________________
+ $cadenaid="";
+ $cadenaip="";
+ $cadenamac="";
+ RecopilaIpesMacs($cmd,$ambito,$idambito);
+ // agp ______________________________________
break;
case $AMBITO_GRUPOSORDENADORES :
$urlimg='../images/iconos/carpeta.gif';
@@ -81,6 +103,12 @@ switch($ambito){
$textambito=$TbMsg[4];
if (isset($_GET["idambito"])) $idambito=$_GET["idambito"];
if (isset($_GET["litambito"])) $litambito=$_GET["litambito"];
+ // agp ______________________________________
+ $cadenaid="";
+ $cadenaip="";
+ $cadenamac="";
+ RecopilaIpesMacs($cmd,$ambito,$idambito);
+ // agp ______________________________________
break;
}
echo '<p align=center><span class=cabeceras>'.$TbMsg["WDI11"].'&nbsp;</span><br>';
diff --git a/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php b/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php
index 4cbe1916..9fb801df 100644
--- a/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php
+++ b/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php
@@ -15,9 +15,9 @@ for($cfgIndex = 0; $cfgIndex < $conKeys; $cfgIndex++){
?>
<input type="hidden" name="atrib_restore" value="">
<?php echo $TbMsg["WDI13"] ?> <br>
- <input type="radio" name="modo" value="deployImage" onClick="enableDirect(this.form)" checked ><?php echo $TbMsg["WDI14"] ?> <br>
- <input type="radio" name="modo" value="updateCache" onClick="disableDirect(this.form)" > <?php echo $TbMsg["WDI15"] ?> <br>
-
+ <input type="radio" name="modo" id="check" value="deployImage" onClick="enableDirect(this.form);MuestraInsires();" checked ><?php echo $TbMsg["WDI14"] ?> <br>
+ <input type="radio" name="modo" id="check" value="updateCache" onClick="disableDirect(this.form);MuestraInsires();" > <?php echo $TbMsg["WDI15"] ?> <br>
+
<tr> <td> <?php echo $TbMsg["WDI16"] ?> </td> <td> <?php echo $TbMsg["WDI17"] ?> </td> <td> <?php echo $TbMsg["WDI18"] ?> </td> <td> <?php echo $TbMsg["WDI19"] ?> </td></tr>
<tr>
diff --git a/admin/WebConsole/asistentes/includes/capturaacciones.php b/admin/WebConsole/asistentes/includes/capturaacciones.php
index 3c24bce0..7e793f96 100644
--- a/admin/WebConsole/asistentes/includes/capturaacciones.php
+++ b/admin/WebConsole/asistentes/includes/capturaacciones.php
@@ -18,6 +18,7 @@ $nombreambito="";
$funcion="";
$atributos="";
$gestor="";
+$filtro="";
if (isset($_POST["idcomando"])) $idcomando=$_POST["idcomando"];
if (isset($_POST["descricomando"])) $descricomando=$_POST["descricomando"];
@@ -27,5 +28,6 @@ if (isset($_POST["nombreambito"])) $nombreambito=$_POST["nombreambito"];
if (isset($_POST["funcion"])) $funcion=$_POST["funcion"];
if (isset($_POST["atributos"])) $atributos=$_POST["atributos"];
if (isset($_POST["gestor"])) $gestor=$_POST["gestor"];
+if (isset($_POST["filtro"])) $filtro=$_POST["filtro"];
diff --git a/admin/WebConsole/asistentes/includes/formularioacciones.php b/admin/WebConsole/asistentes/includes/formularioacciones.php
index ab61879d..66dba1ba 100644
--- a/admin/WebConsole/asistentes/includes/formularioacciones.php
+++ b/admin/WebConsole/asistentes/includes/formularioacciones.php
@@ -9,12 +9,15 @@
// Formulario para paso de parametros comunes para la ejecuciĆ³n de comandos
// *************************************************************************************************************************************************
?>
-<FORM align=center name="fdatosejecucion" action="<?php echo $gestor?>" method="post">
+<FORM align=center name="fdatosejecucion" id="fdatosejecucion" action="<?php echo $gestor?>" method="post">
<INPUT type="hidden" name="idcomando" value="<?php echo $idcomando?>">
<INPUT type="hidden" name="descricomando" value="<?php echo $descricomando?>">
<INPUT type="hidden" name="ambito" value="<?php echo $ambito?>">
<INPUT type="hidden" name="idambito" value="<?php echo $idambito?>">
<INPUT type="hidden" name="funcion" value="<?php echo $funcion?>">
<INPUT type="hidden" name="atributos" value="<?php echo $atributos?>">
+ <INPUT type="hidden" name="sw_ejsis" value="<?php echo $sw_ejsis?>">
+ <INPUT type="hidden" name="cadenaip" value="<?php echo $cadenaip?>">
<INPUT type="hidden" name="gestor" value="<?php echo $gestor?>">
+ <INPUT type="hidden" name="filtro" value="">
diff --git a/admin/WebConsole/asistentes/includes/opcionesacciones.php b/admin/WebConsole/asistentes/includes/opcionesacciones.php
index 31601278..c4984025 100644
--- a/admin/WebConsole/asistentes/includes/opcionesacciones.php
+++ b/admin/WebConsole/asistentes/includes/opcionesacciones.php
@@ -10,8 +10,6 @@
// *************************************************************************************************************************************************
?>
<P align=center><span align=center class=subcabeceras><?php echo $TbMsgAux[0] ?></span></P>
-
-
<?php if($idcomando!=10){?>
<TABLE align=center>
<TR>
@@ -21,6 +19,23 @@
<BR>
<?php }?>
<TABLE align=center class=opciones_ejecucion BORDER=0>
+<!-------------------------------------------------AGP-------------------------------------------------------------------------------->
+ <TR>
+ <TD colspan=4>
+ <?php if($idcomando==8 && $descricomando=="Asistente Deploy de Imagenes" ){ ?>
+ <DIV name="verinsires" id="verinsires">
+ <TABLE id="tabla_conf" class="tabla_listados" align=right border="2" cellpadding="1" cellspacing="1">
+ <TR>
+ <TH colspan=3><?php echo $TbMsgAux[13]; ?>&nbsp;</TH>
+ <TH align="center"><INPUT name=sw_ejsis type=checkbox checked value=0></TH>
+
+ </TR>
+ </TABLE>
+ </DIV>
+ <?php } ?>
+ </TD>
+ </TR>
+<!-------------------------------------------------AGP-------------------------------------------------------------------------------->
<TR>
<TD><INPUT name=sw_ejya type=checkbox checked></TD>
<TD colspan=3> <?php echo $TbMsgAux[1] ?> &nbsp; </TD>