Changeset 2707 for trunk/expressoAdmin1_2/js/jscode

Timestamp:

05/04/10 18:58:04 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problemas no expressoAdmin1_2.

Location:

trunk/expressoAdmin1_2/js/jscode

Files:

• expressoadmin.js (modified) (1 diff)
• institutional_accounts.js (modified) (4 diffs)
• shared_accounts.js (modified) (9 diffs)

trunk/expressoAdmin1_2/js/jscode/expressoadmin.js

@@ -52 +52 @@
                 }
         }
-        _controller.go( {
-                "access" : "$this.ldap_functions.get_associated_domain&context=" + context,
+        ExpressoLivre.go( {
+                "access" : "expressoAdmin1_2.ldap_functions.get_associated_domain&context=" + escape( context ),
                 "handler" : function( data )
                 {

trunk/expressoAdmin1_2/js/jscode/institutional_accounts.js

@@ -60 +60 @@
                 }
         }
-        cExecute ('$this.ldap_functions.get_available_users&context='+context, handler_get_users);
+        ExpressoLivre.go( {
+                "access" : 'expressoAdmin1_2.ldap_functions.get_available_users&context=' + escape(context),
+                "handler" : handler_get_users
+        } );
 }
 
@@ -114 +117 @@
         
         //Inclui usuario comecando com a pesquisa
-        for(i = 0; i < select_available_users_clone.length; i++){
-                if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) )
-                {
-                        sel = select_available_users_tmp.options;
-                        option = new Option(select_available_users_clone[i].text,select_available_users_clone[i].value);
-
-                        if (select_available_users_clone[i].value == -1)
-                                option.disabled = true;
-
-                        sel[sel.length] = option;
-                }
-        }
+        //for(i = 0; i < select_available_users_clone.length; i++){
+        //      if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) )
+        //      {
+        //              sel = select_available_users_tmp.options;
+        //              option = new Option(select_available_users_clone[i].text,select_available_users_clone[i].value);
+//
+//                      if (select_available_users_clone[i].value == -1)
+//                              option.disabled = true;
+//
+//                      sel[sel.length] = option;
+//              }
+//      }
         oWait.innerHTML = '&nbsp;';
 }                       
@@ -202 +205 @@
         var handler_get_institutional_accounts = function(data)
         {
+                data = data.JSON( );
                 if (data.status == 'true')
                 {
@@ -210 +214 @@
                         write_msg(data.msg, 'error');
         }
-        cExecute ('$this.ldap_functions.get_institutional_accounts&input='+input, handler_get_institutional_accounts);
+        ExpressoLivre.go( {
+                "access" : 'expressoAdmin1_2.ldap_functions.get_institutional_accounts&input='+input,
+                "handler" : handler_get_institutional_accounts
+        } );
 }
 

trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -62 +62 @@
         var     handler_get_users = function(data)
         {
+                data = data.JSON( );
                 select_available_users = Element('ea_select_available_users');
                 
@@ -82 +83 @@
                 }
         }
-        cExecute ('$this.ldap_functions.get_available_users2&context='+context, handler_get_users);
+        ExpressoLivre.go( {
+                "access" : 'expressoAdmin1_2.ldap_functions.get_available_users2&context='+context,
+                "handler" : handler_get_users
+        } );
 }
 
@@ -239 +243 @@
         var handler_get_shared_accounts = function(data)
         {
+                data = data.JSON( );
                 if (data.status == 'true')
                 {
@@ -247 +252 @@
                         write_msg(data.msg, 'error');
         }
-        cExecute ('$this.ldap_functions.get_shared_accounts&input='+input, handler_get_shared_accounts);
+        ExpressoLivre.go( {
+                "access" : 'expressoAdmin1_2.ldap_functions.get_shared_accounts&input='+input,
+                "handler" : handler_get_shared_accounts
+        } );
 }
 
@@ -254 +262 @@
         var handle_edit_shared_account = function(data)
         {
+                data = data.JSON( );
                 if (data.status == 'true')
                 {
@@ -300 +309 @@
                         sinc_combos_org(data.user_context);
                         sharemailbox.ownersAcl = new Array();
-            if( data.owners != "undefined" && data.owners_acl != "undefined" ){ 
+            if( data.owners && data.owners != "undefined" && data.owners_acl != "undefined" ){ 
                                 for (i=0; i<data.owners.length; i++){
                                                 sharemailbox.ownersAcl[ data.owners[i] ] = data.owners_acl[i];  
@@ -309 +318 @@
                         write_msg(data.msg, 'error');
         }
-        cExecute ('$this.shared_accounts.get_data&uid='+uid, handle_edit_shared_account);
+        ExpressoLivre.go( {
+                "access" : 'expressoAdmin1_2.shared_accounts.get_data&uid='+uid,
+                "handler" : handle_edit_shared_account
+        } );
 }
 
@@ -383 +395 @@
                 var handler_get_available_users = function(data)
                 {
+                        data = data.JSON( );
+
                         select_available_users = document.getElementById('em_select_available_users');
                 
@@ -403 +417 @@
                         }
                 }
-                cExecute ("$this.ldap_functions.get_available_users2&context="+context, handler_get_available_users);
+                ExpressoLivre.go( {
+                        "access" : 'expressoAdmin1_2.ldap_functions.get_available_users2&context='+context,
+                        "handler" : handler_get_available_users
+                } );
         }