Changeset 1991 for trunk/expressoAdmin1_2/js/jscode/expressoadmin.js

Timestamp:

02/10/10 09:58:44 (14 years ago)

Author:

valmir.sena

Message:

Ticket #902 - Permitir que seja definido um dominio diferente por organizacao

File:

• trunk/expressoAdmin1_2/js/jscode/expressoadmin.js (modified) (4 diffs)

trunk/expressoAdmin1_2/js/jscode/expressoadmin.js

@@ -33 +33 @@
 }
 
+function get_associated_domain(context)
+{
+        var handler_associated_domain = function(data)
+        {
+                if (data != null)
+                {
+                        document.forms[0].associated_domain.value = data;
+                }
+                else
+                {
+                        document.forms[0].associated_domain.value = '';
+                }
+        }
+        cExecute ('$this.ldap_functions.get_associated_domain&context='+context, handler_associated_domain);    
+}
+
 function emailSugestion_expressoadmin2(email) {         
                 if ( email.value.indexOf('@', 0) < 0 )  emailSugestion = 1;
@@ -39 +55 @@
                         var context = "";
 
-                        organization_context = Element('ea_combo_org').value;
+                        organization_context = Element('ea_combo_org').value.toLowerCase();
                         // Transformar os DN em User Friendly Naming format
                         organization_name = organization_context.split(",");
@@ -46 +62 @@
                                 context += tmp[1];
                                 if( i < (organization_name.length - 1) ) context +=  '.';
-                        }                        
-                        email.value = email.value + context;
-                        emailSugestion = 0;
+                        }
+                        if (document.forms[0].associated_domain.value != '')
+                        {
+                                associatedDomain_name = document.forms[0].associated_domain.value;
+                                email.value = email.value + associatedDomain_name;
+                                emailSugestion = 0;
+                        } else{
+                                email.value = email.value + context;
+                                emailSugestion = 0;
+                        }
                 }               
 }
@@ -91 +114 @@
                 org_name = org_name_par.split('.');
                 org_name = org_name[org_name.length-1];
-        
+
                 if (org_name != '')
-                        document.forms[0].mail1.value = document.forms[0].uid.value + '@' + org_name + '.' + domain_name;
+                {
+                        if (document.forms[0].associated_domain.value != '')
+                        {
+                                associatedDomain_name = document.forms[0].associated_domain.value;
+                                document.forms[0].mail1.value = document.forms[0].uid.value + '@' + associatedDomain_name;
+                        }
+                        else
+                        {
+                                document.forms[0].mail1.value = document.forms[0].uid.value + '@' + org_name + '.' + domain_name;
+                        }
+                }
                 else
                         document.forms[0].mail1.value = document.forms[0].uid.value;