Fix the autosuggest ordering so faster operations go first.

Also fix a bug with the initials autosuggest code.

1 files changed, 20 insertions, 20 deletions

diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
index de1e21302..dc755ecd3 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
@@ -102,6 +102,26 @@ from ipagui.helpers import ipahelper
               var displayname = $('form_displayname');
               var initials = $('form_initials');
 
+              if ((cn.value == "") || (cn.value == cn_suggest)) {
+                cn.value = givenname.value + " " + sn.value;
+                cn_suggest = cn.value;
+                new Effect.Highlight(cn);
+              }
+
+              if ((displayname.value == "") ||
+                  (displayname.value == displayname_suggest)) {
+                displayname.value = givenname.value + " " + sn.value;
+                displayname_suggest = displayname.value;
+                new Effect.Highlight(displayname);
+              }
+
+              if ((initials.value == "") ||
+                  (initials.value == initials_suggest)) {
+                initials.value = givenname.value[0] + sn.value[0];
+                initials_suggest = initials.value;
+                new Effect.Highlight(initials);
+              }
+
               if ((uid.value == "") || (uid.value == uid_suggest)) {
                 new Ajax.Request('${tg.url('/suggest_uid')}', {
                     method: 'get',
@@ -125,26 +145,6 @@ from ipagui.helpers import ipahelper
                       }
                     });
               }
-
-              if ((cn.value == "") || (cn.value == cn_suggest)) {
-                cn.value = givenname.value + " " + sn.value;
-                cn_suggest = cn.value;
-                new Effect.Highlight(cn);
-              }
-
-              if ((displayname.value == "") ||
-                  (displayname.value == displayname_suggest)) {
-                displayname.value = givenname.value + " " + sn.value;
-                displayname_suggest = displayname.value;
-                new Effect.Highlight(displayname);
-              }
-
-              if ((displayname.value == "") ||
-                  (displayname.value == displayname_suggest)) {
-                initials.value = givenname.value[0] + sn.value[0];
-                initials_suggest = initials.value;
-                new Effect.Highlight(initials);
-              }
             }
 
             document.getElementById('form_givenname').onchange = autofill;