Changeset 6096 for trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

Timestamp:

05/04/12 10:50:42 (12 years ago)

Author:

marcieli

Message:

Ticket #2690 - Corrigido problema ao remover uma conta compartilhada com expressoCalendar.

File:

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

trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -443 +443 @@
 }
 
+function callbackDelete(sharedUser){
+
+    if(!!sharedUser && $.isArray(sharedUser))
+        for(var i = 0; i < sharedUser.length; i++)
+            if(sharedUser[i].phpgwAccountType == 's'){
+                sharedUser = sharedUser[i];
+                break;
+            }
+        
+        var signature = DataLayer.get('calendarSignature', {
+                filter: ['=','user', sharedUser.id]
+            });
+        
+        signature = $.isArray(signature) ? signature[0] : signature;
+        
+        DataLayer.remove('calendarSignature', signature.id)
+        DataLayer.commit();
+}
+
 function calback(){
     var sharedUser = DataLayer.get('user', {
@@ -527 +546 @@
 
 
-function delete_shared_accounts(uid)
+function delete_shared_accounts(uid, mail)
 {
     if (!confirm(get_lang('Are you sure that you want to delete this shared account') + "?"))
         return;
         
+        var user = {};
+        if(sharemailbox.ownersExpressoCalendarAcl)
+                user =  DataLayer.get('user', {
+                        filter: ['=','mail',mail]
+                });
+        
+        
     var handle_delete_shared_account = function(data_return)
     {
@@ -540 +566 @@
         else
         {
+                if(sharemailbox.ownersExpressoCalendarAcl){
+                        callbackDelete(user);
+                }
+        
             write_msg(get_lang('Shared account successful deleted') + '.', 'normal');
             get_shared_accounts(Element('ea_shared_account_search').value);
@@ -545 +575 @@
         return;
     }
+        
+        
+        
     cExecute ('$this.shared_accounts.delete&uid='+uid, handle_delete_shared_account);
 }