Changeset 8208 for trunk/expressoAdmin1_2
- Timestamp:
- 09/02/13 15:46:37 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/js/jscode/shared_accounts.js
r8193 r8208 374 374 375 375 for (var i=0; i < calendarPermission.length; i++){ 376 sharemailbox.ownersExpressoCalendarAcl[ calendarPermission[i].user.uid ] = calendarPermission[i].aclValues; 377 sharemailbox.currentPemissions[calendarPermission[i].user.uid] = calendarPermission[i].id; 378 // sharemailbox.ownersExpressoCalendarAcl.length = sharemailbox.currentPemissions.length = i; 379 380 if(!current[calendarPermission[i].user.uid ]){ 376 if (calendarPermission[i].user.uid ){ 377 sharemailbox.ownersExpressoCalendarAcl[ calendarPermission[i].user.uid ] = calendarPermission[i].aclValues; 378 sharemailbox.currentPemissions[calendarPermission[i].user.uid] = calendarPermission[i].id; 379 // sharemailbox.ownersExpressoCalendarAcl.length = sharemailbox.currentPemissions.length = i; 380 } 381 if(calendarPermission[i].user.uid && !current[calendarPermission[i].user.uid ]){ 381 382 Element('ea_select_owners').innerHTML = Element('ea_select_owners').innerHTML+'<option value='+ calendarPermission[i].user.uid +'>'+ calendarPermission[i].user.name +'</option>'; 382 383 Element('ea_select_owners').outerHTML = Element('ea_select_owners').outerHTML; … … 507 508 508 509 $.each(sharemailbox.ownersExpressoCalendarAcl, function(user, acl) { 509 510 var usuario = DataLayer.get('user', { 511 filter: ['=','uid',user], 512 criteria: { 513 notExternal: true 510 if (user != "undefined"){ 511 var usuario = DataLayer.get('user', { 512 filter: ['=','uid',user], 513 criteria: { 514 notExternal: true 515 } 516 }); 517 518 if($.isArray(usuario)) 519 usuario = usuario[0]; 520 521 DataLayer.put('calendarToPermission', DataLayer.merge({ 522 user: usuario.id, 523 type: '0', 524 acl: acl, 525 calendar: calendar 526 }, !!sharemailbox.currentPemissions[usuario.uid] ? { 527 id: sharemailbox.currentPemissions[usuario.uid] 528 } : {})); 529 530 if(!!!sharemailbox.currentPemissions[usuario.uid]) 531 DataLayer.put('calendarSignature', { 532 user: usuario.id, 533 calendar: calendar, 534 isOwner: '0', 535 fontColor: '000000', 536 backgroundColor: 'f1efac', 537 borderColor: 'eddb21' 538 }); 514 539 } 515 });516 517 if($.isArray(usuario))518 usuario = usuario[0];519 520 DataLayer.put('calendarToPermission', DataLayer.merge({521 user: usuario.id,522 type: '0',523 acl: acl,524 calendar: calendar525 }, !!sharemailbox.currentPemissions[usuario.uid] ? {526 id: sharemailbox.currentPemissions[usuario.uid]527 } : {}));528 529 if(!!!sharemailbox.currentPemissions[usuario.uid])530 DataLayer.put('calendarSignature', {531 user: usuario.id,532 calendar: calendar,533 isOwner: '0',534 fontColor: '000000',535 backgroundColor: 'f1efac',536 borderColor: 'eddb21'537 });538 539 540 }) 540 541 DataLayer.commit();
Note: See TracChangeset
for help on using the changeset viewer.