Changeset 6299 for trunk/prototype/modules
- Timestamp:
- 05/24/12 17:20:30 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r6295 r6299 463 463 public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) { 464 464 if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) { 465 465 466 $calendarIds = array(); 466 467 foreach ($result as $key => $value) … … 469 470 $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter']))); 470 471 471 if (!is_array($calendar)) 472 $result = ''; 473 474 $newResult = array(); 475 foreach ($calendar as $key => $value) { 476 foreach ($result as $k => $r) { 477 478 if ($r['calendar'] == $value['id']) { 479 $r['calendar'] = $value; 480 array_push($newResult, $r); 472 if ($calendar && count($calendar) > 0){ 473 $newResult = array(); 474 foreach ($calendar as $key => $value) { 475 foreach ($result as $k => $r) { 476 477 if ($r['calendar'] == $value['id']) { 478 $r['calendar'] = $value; 479 array_push($newResult, $r); 480 } 481 481 } 482 482 } 483 } 484 485 foreach ($newResult as $key => &$value) {486 if ($value['user'] != 0) {487 $user = $value['user'];488 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user)); 489 490 if (!$value['user'])491 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));483 484 foreach ($newResult as $key => &$value) { 485 if ($value['user'] != 0) { 486 $user = $value['user']; 487 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user)); 488 489 if (!$value['user']) 490 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user)); 491 } 492 492 } 493 } 494 495 496 $result = $newResult;493 494 $result = $newResult; 495 }else 496 $result = ''; 497 497 } 498 498 } -
trunk/prototype/modules/calendar/js/calendar.shared.js
r6066 r6299 406 406 }, true); 407 407 var resultPublic = DataLayer.get('calendarToPermission', { 408 filter: ['AND', ['=','type',1], ['OR', ['i*','name',$(this).val()], ["i*", "description", $(this).val()]]] ,408 filter: ['AND', ['=','type',1], ['OR', ['i*','name',$(this).val()], ["i*", "description", $(this).val()]], ['!IN','calendar', Calendar.calendarIds]] , 409 409 criteria: { 410 410 deepness: 2 … … 444 444 type: 0 445 445 }) 446 resultNormalize[ i].enabled = currentCalendars[result[i].id] ? false : true;446 resultNormalize[(resultNormalize.length - 1)].enabled = currentCalendars[result[i].id] ? false : true; 447 447 } 448 448 if(resultPublic) … … 454 454 type: 1 455 455 }) 456 resultNormalize[ i].enabled = currentCalendars[resultPublic[i].id] ? false : true;456 resultNormalize[(resultNormalize.length - 1)].enabled = currentCalendars[resultPublic[i].id] ? false : true; 457 457 } 458 458
Note: See TracChangeset
for help on using the changeset viewer.