From 24e793d718c5a8972667fe81b9e6ee978bef1e4e Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Sun, 23 Jan 2011 00:49:11 +0000
Subject: [PATCH] bug fix my previous commit for RT7794

---
 httemplate/edit/phone_device.html         | 2 ++
 httemplate/edit/process/phone_device.html | 4 ++++
 httemplate/elements/select-mac.html       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

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>
-- 
2.11.0