From 536f573f3669809c32c1d1ba26da8d6df1625bce Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 19 Sep 2006 13:51:03 +0000
Subject: [PATCH] Monotone-Parent: 8f2abf0ab22c8d768df5ec31eb8f09a577cd60dd
 Monotone-Revision: 46efb2ce9832230023e4de5e7868f3ad32d4bd02

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-19T13:51:03
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                 |  3 ++
 UI/WebServerResources/UIxContactEditor.js | 37 ++++++++++++-----------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f54e72d5..a96abc544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/UIxContactEditor.js: updated validation
+	code after we added and renamed some fields.
+
 	* UI/WebServerResources/ContactsUI.js: added code to cache contact
 	cards and to handle card updates.
 
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 2d371b5d5..bea208c6c 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -46,34 +46,40 @@ function copyContact(type, email, uid, sn,
     //  var departmentNumber = arguments[10]; 
     //  var l = arguments[11]; 
   var e;
-  e = document.getElementById('cn');
+  e = $('cn');
   e.setAttribute('value', unescapeCallbackParameter(cn));
-  e = document.getElementById('email');
+  e = $('email');
   e.setAttribute('value', email);
-  e = document.getElementById('sn');
+  e = $('sn');
   e.setAttribute('value', unescapeCallbackParameter(sn));
-  e = document.getElementById('givenName');
+  e = $('givenName');
   e.setAttribute('value', unescapeCallbackParameter(givenName));
-  e = document.getElementById('telephoneNumber');
+  e = $('telephoneNumber');
   e.setAttribute('value', telephoneNumber);
-  e = document.getElementById('facsimileTelephoneNumber');
+  e = $('facsimileTelephoneNumber');
   e.setAttribute('value', facsimileTelephoneNumber);
-  e = document.getElementById('mobile');
+  e = $('mobile');
   e.setAttribute('value', mobile);
-  e = document.getElementById('postalAddress');
+  e = $('postalAddress');
   e.setAttribute('value', unescapeCallbackParameter(postalAddress));
-  e = document.getElementById('homePostalAddress');
+  e = $('homePostalAddress');
   e.setAttribute('value', unescapeCallbackParameter(homePostalAddress));
-  e = document.getElementById('departmentNumber');
+  e = $('departmentNumber');
   e.setAttribute('value', unescapeCallbackParameter(departmentNumber));
-  e = document.getElementById('l');
+  e = $('l');
   e.setAttribute('value', unescapeCallbackParameter(l));
 };
 
 function validateContactEditor() {
   var e;
   
-  e = document.getElementById('email');
+  e = $('workMail');
+  if (e.value.length == 0)
+    return true;
+  if (uixEmailRegex.test(e.value) != true)
+    return confirm(labels.invalidemailwarn);
+
+  e = $('homeMail');
   if (e.value.length == 0)
     return true;
   if (uixEmailRegex.test(e.value) != true)
@@ -83,7 +89,7 @@ function validateContactEditor() {
 }
 
 function submitContact(thisForm) {
-  var action = document.getElementById('jsaction');
+  var action = $('jsaction');
   action.setAttribute("name", "save:method");
   action.setAttribute("value", "save");
 
@@ -91,12 +97,9 @@ function submitContact(thisForm) {
 
   window.opener.log ("validating...");
   if (validateContactEditor()) {
-    window.opener.log ("submitting");
     thisForm.submit();
-    window.opener.log ("setting timeout...");
-    window.opener.setTimeout('refreshAppointments();', 200);
+    window.opener.setTimeout("refreshContacts(\""+ window.contactId +"\");", 200);
     window.opener.log ("we close...");
     window.close();
-    window.opener.log ("closed");
   }
 }