diff options
| author | ramon <ramongomez@us.es> | 2015-04-20 10:56:54 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2015-04-20 10:56:54 +0000 |
| commit | 1a2fa9d82bafd3ef8e0d703bf715fe3e58853d0d (patch) | |
| tree | 1e008f200ff4b413d0807eee03df75ef42f39fab /admin/WebConsole/asistentes/jscripts | |
| parent | c916af9faafcd8fa120aeaf9092c0847aa09183a (diff) | |
#673: Actualizar código incluido en OepnGnSys 1.0.6 sobre la rama {{{version1.1}}} para desarrollar la nueva versión.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4609 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/asistentes/jscripts')
| -rw-r--r-- | admin/WebConsole/asistentes/jscripts/EjecutarScripts.js | 10 | ||||
| -rw-r--r-- | admin/WebConsole/asistentes/jscripts/asistentes.js | 26 |
2 files changed, 33 insertions, 3 deletions
diff --git a/admin/WebConsole/asistentes/jscripts/EjecutarScripts.js b/admin/WebConsole/asistentes/jscripts/EjecutarScripts.js index e17411c0..81a916ba 100644 --- a/admin/WebConsole/asistentes/jscripts/EjecutarScripts.js +++ b/admin/WebConsole/asistentes/jscripts/EjecutarScripts.js @@ -11,7 +11,15 @@ if (comprobar_datos()){ var RC='@'; document.fdatosejecucion.atributos.value="scp="+escape(document.fdatos.codigo.value)+RC; - document.fdatosejecucion.submit(); + if( document.fdatosejecucion.ambito.value!=16 && document.fdatos.idmetodo.value=="UNICAST" || document.fdatos.idmetodo.value=="UNICAST-DIRECT"){ + if (confirm(TbMsg[4]) == true) { + document.fdatosejecucion.submit(); + } else { + cancelar(); + } + }else{ + document.fdatosejecucion.submit(); + } } } //________________________________________________________________________________________________________ diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js index dab6cf06..97ae9173 100644 --- a/admin/WebConsole/asistentes/jscripts/asistentes.js +++ b/admin/WebConsole/asistentes/jscripts/asistentes.js @@ -26,18 +26,40 @@ ogEcho log session \"[0] $MSG_SCRIPTS_TASK_START " + command + "\"\n \ ogExecAndLog command " + command + " \n "; } +// disableDirect(form): En Deploy de imagenes si se elige updateCache se impide elegir multicast-direct o unicast-direct +function disableDirect(form){ + // MULTICAST-DIRECT + form.idmetodo.options[2].disabled=true; + // UNICAST-DIRECT + form.idmetodo.options[4].disabled=true; +} +// enableDirect(form): En Deploy de imagenes si se elige deployCache se permite elegir multicast-direct o unicast-direct +function enableDirect(form){ + // MULTICAST-DIRECT + form.idmetodo.options[2].disabled=false; + // UNICAST-DIRECT + form.idmetodo.options[4].disabled=false; +} + + function codeDeployImage(form){ switch (form.idmetodo.value) { case "MULTICAST": protocol="MULTICAST " + form.mcastpuerto.value + ":" + form.mcastmodo.value + ":" + form.mcastdireccion.value + ":" + form.mcastvelocidad.value + "M:" + form.mcastnclien.value + ":" + form.mcastseg.value + " "; break; + case "MULTICAST-DIRECT": + protocol="MULTICAST-DIRECT " + form.mcastpuerto.value + ":" + form.mcastmodo.value + ":" + form.mcastdireccion.value + ":" + form.mcastvelocidad.value + "M:" + form.mcastnclien.value + ":" + form.mcastseg.value + " "; + break; case "TORRENT": protocol=" TORRENT " + form.modp2p.value + ":" + form.timep2p.value; break; case "UNICAST": protocol=" UNICAST"; break; + case "UNICAST-DIRECT": + protocol=" UNICAST-DIRECT"; + break; } //form.codigo.value="deployImage REPO /"; if (form.modo[0].checked) @@ -202,8 +224,8 @@ partCode += " EMPTY:0"; ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ ogEcho log session \"[0] $MSG_HELP_ogCreatePartitions \"\n \ ogEcho session \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\"\n \ -ogUnmountCache \n \ ogUnmountAll "+n_disk+" 2>/dev/null\n \ +ogUnmountCache \n \ " + cacheCode + " \n \ ogEcho session \"[60] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ ogExecAndLog command session ogListPartitions "+n_disk+" \n \ @@ -289,8 +311,8 @@ partCode += " EMPTY:0"; ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ ogEcho log session \"[0] $MSG_HELP_ogCreatePartitions "+n_disk+"\"\n \ ogEcho session \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\"\n \ -ogUnmountCache \n \ ogUnmountAll "+n_disk+" \n \ +ogUnmountCache \n \ " + cacheCode + " \n \ ogEcho session \"[60] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ ogExecAndLog command session ogListPartitions "+n_disk+" \n \ |