Changeset 8232 for branches/2.5/expressoAdmin1_2/js/jscode/shared_accounts.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/expressoAdmin1_2/js/jscode/shared_accounts.js (modified) (6 diffs)

branches/2.5/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -97 +97 @@
 {
     combo_org_available_users = Element('ea_combo_org_available_users');
-    context = context.toLowerCase(); 
+    context = context.toLowerCase();
     for (i=0; i<combo_org_available_users.length; i++)
     {
@@ -300 +300 @@
 
             var combo_org = Element('ea_combo_org');
-            var context_to_select = data.user_context.toLowerCase(); 
+            var context_to_select = data.user_context.toLowerCase();
             for (i=0; i<combo_org.length; i++)
             {
@@ -374 +374 @@
 
                     for (var i=0; i < calendarPermission.length; i++){
-                        sharemailbox.ownersExpressoCalendarAcl[ calendarPermission[i].user.uid ] = calendarPermission[i].aclValues;                   
-                        sharemailbox.currentPemissions[calendarPermission[i].user.uid] = calendarPermission[i].id;
-                        // sharemailbox.ownersExpressoCalendarAcl.length = sharemailbox.currentPemissions.length = i;
-                    
-                        if(!current[calendarPermission[i].user.uid ]){
+                        if (calendarPermission[i].user.uid ){
+                                sharemailbox.ownersExpressoCalendarAcl[ calendarPermission[i].user.uid ] = calendarPermission[i].aclValues;                   
+                                sharemailbox.currentPemissions[calendarPermission[i].user.uid] = calendarPermission[i].id;
+                                // sharemailbox.ownersExpressoCalendarAcl.length = sharemailbox.currentPemissions.length = i;
+                    }
+                        if(calendarPermission[i].user.uid && !current[calendarPermission[i].user.uid ]){
                             Element('ea_select_owners').innerHTML = Element('ea_select_owners').innerHTML+'<option value='+ calendarPermission[i].user.uid +'>'+ calendarPermission[i].user.name +'</option>';
                             Element('ea_select_owners').outerHTML = Element('ea_select_owners').outerHTML;
@@ -507 +508 @@
 
         $.each(sharemailbox.ownersExpressoCalendarAcl, function(user, acl) {
-
-            var usuario = DataLayer.get('user', {
-                filter: ['=','uid',user], 
-                criteria: {
-                    notExternal: true
+                if (user != "undefined"){
+                    var usuario = DataLayer.get('user', {
+                        filter: ['=','uid',user], 
+                        criteria: {
+                            notExternal: true
+                        }
+                    });
+
+                    if($.isArray(usuario))
+                        usuario = usuario[0];
+
+                    DataLayer.put('calendarToPermission', DataLayer.merge({
+                        user:  usuario.id,
+                        type: '0',
+                        acl: acl,
+                        calendar: calendar
+                    }, !!sharemailbox.currentPemissions[usuario.uid] ? {
+                        id: sharemailbox.currentPemissions[usuario.uid]
+                    } : {}));
+
+                    if(!!!sharemailbox.currentPemissions[usuario.uid])
+                        DataLayer.put('calendarSignature', {
+                            user: usuario.id,
+                            calendar:  calendar,
+                            isOwner:  '0',
+                            fontColor:  '000000',
+                            backgroundColor: 'f1efac',
+                            borderColor: 'eddb21'
+                        });
                 }
-            });
-
-            if($.isArray(usuario))
-                usuario = usuario[0];
-
-            DataLayer.put('calendarToPermission', DataLayer.merge({
-                user:  usuario.id,
-                type: '0',
-                acl: acl,
-                calendar: calendar
-            }, !!sharemailbox.currentPemissions[usuario.uid] ? {
-                id: sharemailbox.currentPemissions[usuario.uid]
-            } : {}));
-
-            if(!!!sharemailbox.currentPemissions[usuario.uid])
-                DataLayer.put('calendarSignature', {
-                    user: usuario.id,
-                    calendar:  calendar,
-                    isOwner:  '0',
-                    fontColor:  '000000',
-                    backgroundColor: 'f1efac',
-                    borderColor: 'eddb21'
-                });
-
         })
         DataLayer.commit();  
@@ -622 +623 @@
 cShareMailbox.prototype.getaclfromuser = function(user)
 {
-        
     Element('em_input_readAcl').checked = false;
     Element('em_input_deleteAcl').checked = false;
@@ -642 +642 @@
     Element('em_input_deleteCalendar').disabled = true;
     Element('em_input_restrictCalendar').disabled = true;
-                
-                
+    
+    if (!this.ownersExpressoCalendarAcl[user] && !this.ownersCalendarAcl[user]){           
+                DataLayer.dispatchPath = "prototype/";
+                var sharedUser = DataLayer.get('user', {
+                    filter: ['=','mail',$('#mail').val()]
+                });
+                for(var j = 0; j < sharedUser.length; j++)
+                    if(sharedUser[j].phpgwAccountType == 's'){
+                        sharedUser = sharedUser[j];
+                        break;
+                    }
+
+                var signature = DataLayer.get('calendarSignature', {
+                    filter: ['=','user', sharedUser.id]
+                });
+
+                if(!signature)
+                    return;
+
+                var usuario = DataLayer.get('user', {
+                    filter: ['=','uid',user], 
+                    criteria: {
+                        notExternal: true
+                    }
+                });
+                var calendarPermission = DataLayer.get('calendarToPermission', {
+                    filter: ['AND', ['=','calendar',signature[0].calendar], ['=','user',usuario[0].id] ]
+                });
+                this.ownersExpressoCalendarAcl[user] = calendarPermission[0] ? calendarPermission[0].acl : "";
+    }
     if(this.ownersExpressoCalendarAcl[user])
     {