[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/luci/cluster resource-form-macros resour ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-01-17 20:50:39

Modified files:
	luci/cluster   : resource-form-macros resource_form_handlers.js 

Log message:
	Support for the new resources in RHEL4.5

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.25&r2=1.26

--- conga/luci/cluster/resource-form-macros	2006/12/05 06:44:09	1.25
+++ conga/luci/cluster/resource-form-macros	2007/01/17 20:50:38	1.26
@@ -129,6 +129,18 @@
 		<div metal:use-macro="here/resource-form-macros/macros/nfsc_macro" />
 		<div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
 		<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
+
+		<tal:block tal:condition="python: os_version and os_version == 'rhel5'">
+			<div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
+		</tal:block>
+
+		<tal:block tal:condition="python: os_version and os_version == 'rhel4'">
+			<div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
+			<div metal:use-macro="here/resource-form-macros/macros/mysql_macro" />
+			<div metal:use-macro="here/resource-form-macros/macros/openldap_macro" />
+			<div metal:use-macro="here/resource-form-macros/macros/postgres-8_macro" />
+			<div metal:use-macro="here/resource-form-macros/macros/tomcat-5_macro" />
+		</tal:block>
 	</div>
 </div>
 
@@ -353,7 +365,7 @@
 				<input type="checkbox" name="monitorLink"
 					tal:attributes="
 						disabled python: editDisabled;
-						checked res/attrs/monitor_link | string: 1" />
+						checked res/attrs/monitor_link | string: checked" />
 			</td>
 		</tr>
 	</table>
@@ -796,11 +808,660 @@
 				<input type="text" size="20" name="options"
 					tal:attributes="
 						disabled python: editDisabled;
-						value res/attrs/options | nothing"/>
+						value res/attrs/options | nothing" />
+			</td>
+		</tr>
+
+		<tr>
+			<td class="systemsTable">Allow Recover</td>
+			<td class="systemsTable">
+				<input type="checkbox" name="allow_recover"
+					tal:attributes="
+						disabled python: editDisabled;
+						checked res/attrs/allow_recover | nothing" />
+			</td>
+		</tr>
+	</table>
+
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="POSTGRES-8"
+	tal:attributes="id res/name | nothing" metal:define-macro="postgres-8_macro">
+	<p class="reshdr">PostgreSQL 8 Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
+
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="postgres-8" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="config_file"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/config_file | string:/var/lib/pgsql/data/postgresql.conf" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Postmaster User</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="postmaster_user"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/postmaster_user | string:postgres" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Postmaster Options</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="postmaster_options"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/postmaster_options | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Shutdown Wait (seconds)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="shutdown_wait"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/shutdown_wait | string:0" />
+			</td>
+		</tr>
+	</table>
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="APACHE"
+	tal:attributes="id res/name | nothing" metal:define-macro="apache_macro">
+	<p class="reshdr">Apache Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
+
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="apache" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Server Root</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="server_root"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/server_root | string:/etc/httpd" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="config_file"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/config_file | string:conf/httpd.conf" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">httpd Options</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="httpd_options"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/httpd_options | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Shutdown Wait (seconds)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="shutdown_wait"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/shutdown_wait | string:0" />
+			</td>
+		</tr>
+	</table>
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="OPENLDAP"
+	tal:attributes="id res/name | nothing" metal:define-macro="openldap_macro">
+	<p class="reshdr">Open LDAP Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
+
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="openldap" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="config_file"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/config_file | string:/etc/openldap/slapd.conf" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">URL List</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="url_list"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/url_list | string:ldap:///"; />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">slapd Options</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="slapd_options"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/slapd_options | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Shutdown Wait (seconds)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="shutdown_wait"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/shutdown_wait | string:0" />
 			</td>
 		</tr>
 	</table>
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="MYSQL"
+	tal:attributes="id res/name | nothing" metal:define-macro="mysql_macro">
+	<p class="reshdr">MySQL Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
 
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="mysql" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="config_file"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/config_file | string:/etc/my.cnf" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Listen Address</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="listen_address"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/listen_address | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">mysqld Options</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="mysqld_options"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/mysqld_options | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Shutdown Wait (seconds)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="shutdown_wait"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/shutdown_wait | string:0" />
+			</td>
+		</tr>
+	</table>
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="VM"
+	tal:attributes="id res/name | nothing" metal:define-macro="vm_macro">
+	<p class="reshdr">Virtual Machine Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
+
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="vm" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Domain</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="domain"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/domain | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Recovery Options</td>
+			<td class="systemsTable">
+				<select name="recovery">
+					tal:attributes="disabled python: editDisabled"
+					tal:define="recovery_opt res/recovery | string:relocate">
+					<option name="relocate"
+						tal:attributes="
+							content string:Relocate
+							selected python: recovery_opt == 'relocate' and 'selected' or ''" />
+					<option name="restart"
+						tal:attributes="
+							content string:Restart
+							selected python: recovery_opt == 'restart' and 'selected' or ''" />
+					<option name="disable"
+						tal:attributes="
+							content string:Disable
+							selected python: recovery_opt == 'disable' and 'selected' or ''" />
+				</select>
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Memory Size</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="memory"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/memory | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Bootloader</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="bootloader"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/bootloader | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="path"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/path | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Root disk for the VM (physical, on the host)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="rootdisk_physical"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/rootdisk_physical | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Root disk for the VM (as presented to the VM)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="rootdisk_virtual"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/rootdisk_virtual | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Swap disk for the VM (physical, on the host)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="swapdisk_physical"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/swapdisk_physical | nothing" />
+			</td>
+		</tr>
+		<tr class="systemsTable">
+			<td class="systemsTable">Swap disk for the VM (as presented to the VM)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="swapdisk_virtual"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/swapdisk_virtual | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Virtual interface MAC address</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="vif"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/vif | nothing" />
+			</td>
+		</tr>
+	</table>
+	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+	</form>
+</div>
+
+<div class="rescfg" name="tomcat-5"
+	tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
+	<p class="reshdr">Tomcat 5 Configuration</p>
+
+	<form method="post"
+		tal:attributes="name res/parent_uuid | nothing"
+		tal:define="editDisabled resourceIsRef | nothing">
+
+	<input name="immutable" type="hidden" value="true"
+		tal:condition="editDisabled" />
+
+	<input name="edit" type="hidden" value="true"
+		tal:condition="python: ptype == '33' and True or False" />
+
+	<input name="pagetype" type="hidden"
+		tal:attributes="value python: ptype" />
+
+	<input name="global" type="hidden"
+		tal:attributes="value resourceIsRef | nothing" />
+
+	<input name="parent_uuid" type="hidden"
+		tal:attributes="value res/parent_uuid | nothing" />
+
+	<input name="uuid" type="hidden"
+		tal:attributes="value res/uuid | nothing" />
+
+	<input name="tree_level" type="hidden"
+		tal:attributes="value res/indent_ctr | string:0" />
+
+	<input name="clustername" type="hidden"
+		tal:attributes="
+			value request/clustername | request/form/clustername | nothing" />
+
+	<input name="oldname" type="hidden"
+		tal:attributes="value res/name | nothing" />
+
+	<input name="type" type="hidden" value="tomcat-5" />
+
+	<table class="systemsTable">
+		<tr class="systemsTable">
+			<td class="systemsTable">Name</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="resourceName"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/name | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Config File</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="config_file"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/config_file | string:/etc/tomcat5/tomcat5.conf" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Tomcat User</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="tomcat_user"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/tomcat_user | string:tomcat" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Catalina Options</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="catalina_options"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/catalina_options | nothing" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Catalina Base</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="catalina_base"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/catalina_base | string:/usr/share/tomcat5" />
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
+			<td class="systemsTable">Shutdown Wait (seconds)</td>
+			<td class="systemsTable">
+				<input type="text" size="20" name="shutdown_wait"
+					tal:attributes="
+						disabled python: editDisabled;
+						value res/shutdown_wait | string:30" />
+			</td>
+		</tr>
+	</table>
 	<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
 	</form>
 </div>
--- conga/luci/cluster/resource_form_handlers.js	2006/12/06 22:44:18	1.25
+++ conga/luci/cluster/resource_form_handlers.js	2007/01/17 20:50:38	1.26
@@ -98,6 +98,25 @@
 	return (errors);
 }
 
+function validate_apache(form) {
+}
+
+function validate_tomcat5(form) {
+}
+
+function validate_postgres8(form) {
+}
+
+function validate_mysql(form) {
+}
+
+function validate_openldap(form) {
+}
+
+function validate_vm(form) {
+}
+
+
 function validate_nfs_mount(form) {
 	var errors = new Array();
 
@@ -211,6 +230,14 @@
 	return (errors);
 }
 
+var required_children = new Array();
+var required_children['nfsx'] = [ 'nfsc' ];
+
+var forbidden_children = new Array();
+var forbidden_children['ip'] = [ 'nfsc', 'nfsx' ];
+var forbidden_children['netfs'] = [ 'nfsc', 'nfsx' ];
+var forbidden_children['nfsx'] = [ 'nfsx' ];
+
 var form_validators = new Array();
 form_validators['ip'] = validate_ip;
 form_validators['nfsm'] = validate_nfs_mount;
@@ -220,6 +247,12 @@
 form_validators['gfs'] = validate_gfs;
 form_validators['scr'] = validate_script;
 form_validators['smb'] = validate_samba;
+form_validators['vm'] = validate_vm;
+form_validators['apache'] = validate_apache;
+form_validators['tomcat-5'] validate_tomcat5;
+form_validators['postgres-8'] validate_postgres8;
+form_validators['openldap'] = validate_openldap;
+form_validators['mysql'] = validate_mysql;
 
 function check_form(form) {
 	var valfn = form_validators[form.type.value];
@@ -415,11 +448,12 @@
 			{
 				temp += '<input type="' + res_type + '" name="' + input_elem[j].name + '" value="' + input_elem[j].value + '" />';
 			} else if (res_type == 'checkbox' || res_type == 'radio') {
-				if (input_elem[j].checked)
+				if (input_elem[j].checked) {
 					temp += '<input type="' + res_type + '" name="' + input_elem[j].name + '" checked="checked"';
-				if (res_type == 'radio')
-					temp += ' value="' + input_elem[j].value + '"';
-				temp += ' />';
+					if (res_type == 'radio')
+						temp += ' value="' + input_elem[j].value + '"';
+					temp += ' />';
+				}
 			}
 		}
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]