Changeset 5850 for trunk/expressoAdmin1_2
- Timestamp:
- 03/29/12 16:32:30 (12 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
r5509 r5850 457 457 function getTemplate( $tpls, $macros, $target = false ) 458 458 { 459 require_once( ROOT.' header.inc.php' );459 require_once( ROOT.'/header.inc.php' ); 460 460 461 461 $template = CreateObject( 'phpgwapi.Template', PHPGW_APP_TPL ); -
trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r5804 r5850 107 107 'display_quota_used' => 'none', 108 108 'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none', 109 'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none' 109 'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none', 110 'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar' 110 111 ); 111 112 $p->set_var($var); -
trunk/expressoAdmin1_2/js/jscode/shared_accounts.js
r5804 r5850 212 212 213 213 var sharedUser = DataLayer.get('user', {filter: ['=','mail',$('#mail').val()]}); 214 var signature = DataLayer.get('calendarSignature', {filter: ['=','user', sharedUser[0].id]}); 215 216 var usuario = DataLayer.get('user', {filter: ['AND', ['=','uid',user], ['*','mail',user] ]}); 217 var calendarPermission = DataLayer.get('calendarToPermission', {filter: ['AND', ['=','calendar',signature[0].calendar], ['=','user',usuario[0].id] ] }); 214 for(var i = 0; i < sharedUser.length; i++) 215 if(sharedUser[i].phpgwAccountType == 's'){ 216 sharedUser = sharedUser[i]; 217 break; 218 } 219 220 var signature = DataLayer.get('calendarSignature', {filter: ['=','user', sharedUser.id]}); 221 222 if(!signature) 223 return; 224 225 var usuario = DataLayer.get('user', {filter: ['=','uid',user], criteria: {notExternal: true}}); 226 var calendarPermission = DataLayer.get('calendarToPermission', {filter: ['AND', ['=','calendar',signature[0].calendar], ['=','user',usuario[0].id] ]}); 218 227 219 228 var signatureUser = DataLayer.get('calendarSignature', {filter: ['AND', ['=','calendar', signature[0].calendar], ['=','user', usuario[0].id ] ]}); 220 229 221 DataLayer.remove('calendarSignature', signatureUser[0].id); 222 DataLayer.remove('calendarToPermission', calendarPermission[0].id); 230 if(!!signatureUser && signatureUser[0].id) 231 DataLayer.remove('calendarSignature', signatureUser[0].id); 232 233 if(!!calendarPermission && calendarPermission[0].id) 234 DataLayer.remove('calendarToPermission', calendarPermission[0].id); 223 235 224 236 } … … 377 389 378 390 if(!!sharedUser && $.isArray(sharedUser)) 379 sharedUser = sharedUser[0]; 391 for(var i = 0; i < sharedUser.length; i++) 392 if(sharedUser[i].phpgwAccountType == 's'){ 393 sharedUser = sharedUser[i]; 394 break; 395 } 380 396 381 397 if(!!!sharemailbox.currentPemissions[sharedUser.id]) … … 410 426 $.each(sharemailbox.ownersExpressoCalendarAcl, function(user, acl) { 411 427 412 var usuario = DataLayer.get('user', {filter: [' AND', ['=','uid',user], ['*','mail',user] ]});428 var usuario = DataLayer.get('user', {filter: ['=','uid',user], criteria: {notExternal: true}}); 413 429 414 430 if($.isArray(usuario)) 415 431 usuario = usuario[0]; 416 432 417 418 433 DataLayer.put('calendarToPermission', DataLayer.merge({ 419 434 user: usuario.id, … … 455 470 function handler_save_shared_accounts2(data_return) 456 471 { 457 if (!data_return.status) 458 { 459 write_msg(data_return.msg, 'error'); 460 } 461 else 462 { 463 464 hidden_owners_acl.value = ""; 472 if(data_return){ 473 if (data_return.status){ 474 hidden_owners_acl.value = ""; 465 475 close_lightbox(); 466 476 write_msg(get_lang('Shared account successful saved') + '.', 'normal'); 477 }else 478 write_msg(data_return.msg , 'error'); 467 479 } 468 480 return; -
trunk/expressoAdmin1_2/templates/default/shared_accounts_modal.tpl
r5804 r5850 50 50 <tbody> 51 51 <tr> 52 <td colspan="2" width="125"><b>{lang_calendar}: </b></td>52 <td colspan="2" width="125"><b>{lang_calendar}: {calendarName}</b></td> 53 53 </tr> 54 54 <tr> … … 72 72 <tbody> 73 73 <tr> 74 <td colspan="2" width="125"><b>{lang_calendar}: </b></td>74 <td colspan="2" width="125"><b>{lang_calendar}: {calendarName}</b></td> 75 75 </tr> 76 76 <tr>
Note: See TracChangeset
for help on using the changeset viewer.