summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevinse <levinse>2011-01-23 00:49:12 +0000
committerlevinse <levinse>2011-01-23 00:49:12 +0000
commitfde8ce7591cfe115dc12b9d5ea9ff896228a81e0 (patch)
tree6a5ded5ec023dbc0d8eaa1ee01128fcf3bff0c45
parent61fbcfa109b5cc8e0eeff08fcd086164ee640904 (diff)
bug fix my previous commit for RT7794
-rw-r--r--httemplate/edit/phone_device.html2
-rw-r--r--httemplate/edit/process/phone_device.html4
-rw-r--r--httemplate/elements/select-mac.html2
3 files changed, 7 insertions, 1 deletions
diff --git a/httemplate/edit/phone_device.html b/httemplate/edit/phone_device.html
index c42e714e2..4aec63e5a 100644
--- a/httemplate/edit/phone_device.html
+++ b/httemplate/edit/phone_device.html
@@ -95,6 +95,8 @@ $js .= "\");
}
}
+
+ devicepart_changed(document.getElementById('devicepart'));
</SCRIPT>";
$js;
diff --git a/httemplate/edit/process/phone_device.html b/httemplate/edit/process/phone_device.html
index df9d5e793..689a65ede 100644
--- a/httemplate/edit/process/phone_device.html
+++ b/httemplate/edit/process/phone_device.html
@@ -10,6 +10,10 @@
%>
<%init>
+if($cgi->param('sel_mac_addr') && !$cgi->param('mac_addr')) {
+ $cgi->param('mac_addr',$cgi->param('sel_mac_addr'));
+}
+
# :/ needs agent-virt so you can't futz with arbitrary devices
die "access denied"
diff --git a/httemplate/elements/select-mac.html b/httemplate/elements/select-mac.html
index 3153ca7cd..8b1c71fea 100644
--- a/httemplate/elements/select-mac.html
+++ b/httemplate/elements/select-mac.html
@@ -6,7 +6,7 @@
<% include( '/elements/input-text.html', %opt, 'type'=>'text' ) %>
-<SELECT ID="<% $opt{'prefix'} %>sel_mac_addr" NAME="<% $opt{'prefix'} %>mac_addr"
+<SELECT ID="<% $opt{'prefix'} %>sel_mac_addr" NAME="<% $opt{'prefix'} %>sel_mac_addr"
notonChange="<% $opt{'prefix'} %>mac_addr_changed(this); <% $opt{'onchange'} %>"
<% $opt{'disabled'} %> STYLE="display: none">
<OPTION VALUE="">Select MAC address</OPTION>