diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-10-02 15:49:05 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-10-02 15:49:05 -0400 |
| commit | 765930cf5dd70e84bfea3aa556393fee8b565ffc (patch) | |
| tree | a7deb613adc393907f1bce9b0d8287b7d4bd1a60 | |
| parent | 9963d289c241c96495626bd1ac11cacde3153c22 (diff) | |
| download | cobbler-765930cf5dd70e84bfea3aa556393fee8b565ffc.tar.gz cobbler-765930cf5dd70e84bfea3aa556393fee8b565ffc.tar.xz cobbler-765930cf5dd70e84bfea3aa556393fee8b565ffc.zip | |
fixed saving of is_static dependent fields, remove duplicated code
Conflicts:
web/cobbler_web/templates/generic_edit.tmpl
| -rw-r--r-- | web/cobbler_web/templates/generic_edit.tmpl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/web/cobbler_web/templates/generic_edit.tmpl b/web/cobbler_web/templates/generic_edit.tmpl index 0e055b23..e9a0e496 100644 --- a/web/cobbler_web/templates/generic_edit.tmpl +++ b/web/cobbler_web/templates/generic_edit.tmpl @@ -159,6 +159,7 @@ function save_intf(which) } +<<<<<<< HEAD:web/cobbler_web/templates/generic_edit.tmpl is_slave = false is_master = false @@ -173,9 +174,10 @@ function save_intf(which) itable["name"] = iname itable["mac_address"] = document.getElementById("mac_address").value +======= +>>>>>>> 807ff00... fixed saving of is_static dependent fields, remove duplicated code:web/cobbler_web/templates/generic_edit.tmpl var bond = document.getElementById("bonding").value var is_slave = false; - var is_static = false; var is_master = false; if (bond == "master") { is_master = true; @@ -183,10 +185,14 @@ function save_intf(which) if (bond == "slave") { is_slave = true; } + is_static=document.getElementById("static").checked + + itable["name"] = iname + itable["mac_address"] = document.getElementById("mac_address").value itable["bonding"] = bond itable["bonding_master"] = get_enabled_field("bonding_master",is_slave) itable["bonding_opts"] = get_enabled_field("bonding_opts",is_master) - itable["static"] = document.getElementById("static").checked + itable["static"] = is_static itable["ip_address"] = get_enabled_field("ip_address",(!is_slave)) itable["subnet"] = get_enabled_field("subnet",(!is_slave) && is_static) itable["dns_name"] = get_enabled_field("dns_name",!is_slave) |