Changeset 7164 for trunk/prototype/modules/calendar
- Timestamp:
- 09/04/12 17:09:47 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7097 r7164 744 744 } 745 745 746 public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) { 746 public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) { 747 747 if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) { 748 748 749 749 $calendarIds = array(); 750 foreach ($result as $ key => $value)751 array_push($calendarIds, $value['calendar']);750 foreach ($result as $value) 751 $calendarIds[] = $value['calendar']; 752 752 753 753 $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds)))); … … 755 755 if ($calendar && count($calendar) > 0){ 756 756 $newResult = array(); 757 foreach ($calendar as $key =>$value) {758 foreach ($result as $k =>$r) {757 foreach ($calendar as $value) { 758 foreach ($result as $r) { 759 759 760 760 if ($r['calendar'] == $value['id']) { 761 761 $r['calendar'] = $value; 762 array_push($newResult, $r);762 $newResult[] = $r; 763 763 } 764 764 } 765 765 } 766 766 767 foreach ($newResult as $key =>&$value) {767 foreach ($newResult as &$value) { 768 768 if ($value['user'] != 0) { 769 $user = $value['user']; 770 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user)); 769 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $value['user'])); 771 770 772 771 if (!$value['user']) 773 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $ user));772 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $value['user'])); 774 773 } 774 $value['owner'] = Controller::read(array('concept' => 'user', 'id' => $value['owner'])); 775 775 } 776 777 776 $result = $newResult; 778 777 }else … … 955 954 //Caso não seja o dono da agenda retorna o objeto permission com as acls 956 955 if ($result[$i]['isOwner'] == 0) { 957 $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'user', Config::me('uidNumber')) )));956 $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'user', Config::me('uidNumber')), 'deepness' => 2))); 958 957 959 958 if (!is_array($permission) || !$permission) { 960 959 961 $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1')) ));960 $permission = Controller::find(array('concept' => 'calendarToPermission'), false, array('filter' => array('AND', array('=', 'calendar', $v['calendar']), array('=', 'type', '1')), 'deepness' => 2 )); 962 961 } 963 962 $result[$i]['permission'] = $permission[0]; -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7075 r7164 133 133 return returns; 134 134 }; 135 console.log(evtObj); 135 136 var res = $.map(evtObj, function( objEvent ){ 136 137 return { … … 140 141 user: objEvent.user, 141 142 acl: constantAcl(objEvent.acl) , 142 aclValues: objEvent.acl 143 aclValues: objEvent.acl, 144 owner: objEvent.owner 143 145 }; 144 146 }); … … 190 192 }); 191 193 192 /*Todo Melhorias ser ão feitas na API*/194 /*Todo Melhorias serï¿œo feitas na API*/ 193 195 //DataLayer.poll( "schedulable" ); 194 196 … … 718 720 priority: form.priority, 719 721 category: form.category, 720 summary: form.summary == '' ? 'Tarefa sem t ítulo' : form.summary,722 summary: form.summary == '' ? 'Tarefa sem tï¿œtulo' : form.summary, 721 723 description: form.description, 722 724 timezone: tzId, … … 902 904 'startTime': 'Data de inicio', 903 905 'endTime' : 'Data de fim', 904 'summary' : 'T ítulo',905 'description': 'Descri ção',906 'summary' : 'Tï¿œtulo', 907 'description': 'Descriᅵᅵo', 906 908 'status': 'Status', 907 909 'percentage': 'Porcentagem', 908 910 'priority': 'Prioridade', 909 'due' : 'Previs ão de término'911 'due' : 'Previsï¿œo de tï¿œrmino' 910 912 }; 911 913 912 914 var statusDecoded = { 913 1: 'Sem a ções',915 1: 'Sem aᅵᅵes', 914 916 2: 'Em processo', 915 917 3: 'Finalzada', … … 1078 1080 priority: form.priority, 1079 1081 category: form.category, 1080 summary: form.summary == '' ? 'Atividade sem t ítulo' : form.summary,1082 summary: form.summary == '' ? 'Atividade sem tï¿œtulo' : form.summary, 1081 1083 description: form.description, 1082 1084 timezone: tzId, … … 1127 1129 task = DataLayer.get('schedulable', task); 1128 1130 1129 //Resolve problemas com atualiza ção na camada Cliente1131 //Resolve problemas com atualizaᅵᅵo na camada Cliente 1130 1132 if(!$.isNumeric(task.startTime)){ 1131 1133 DataLayer.remove('schedulable', task.id, false); … … 1347 1349 category: form.category, 1348 1350 priority: form.priority, 1349 summary: form.summary == '' ? 'Evento sem t ítulo' : form.summary,1351 summary: form.summary == '' ? 'Evento sem tï¿œtulo' : form.summary, 1350 1352 description: form.description, 1351 1353 timezone: tzId, … … 1429 1431 var typeRepeat = { 1430 1432 'none': false, 1431 'daily': 'Repeti ção diária',1432 'weekly': 'Repeti ção semanal',1433 'monthly': 'Repeti ção mensal',1434 'yearly': 'repeti ção anual'1433 'daily': 'Repetiᅵᅵo diï¿œria', 1434 'weekly': 'Repetiᅵᅵo semanal', 1435 'monthly': 'Repetiᅵᅵo mensal', 1436 'yearly': 'repetiᅵᅵo anual' 1435 1437 } 1436 1438 … … 1520 1522 var typeRepeat = { 1521 1523 'none': false, 1522 'daily': 'Repeti ção diária',1523 'weekly': 'Repeti ção semanal',1524 'monthly': 'Repeti ção mensal',1525 'yearly': 'repeti ção anual'1524 'daily': 'Repetiᅵᅵo diï¿œria', 1525 'weekly': 'Repetiᅵᅵo semanal', 1526 'monthly': 'Repetiᅵᅵo mensal', 1527 'yearly': 'repetiᅵᅵo anual' 1526 1528 } 1527 1529 … … 1787 1789 ['AND', 1788 1790 ['>=', 'rangeEnd', filter.start.getTime()], 1789 ['<=', 'rangeEnd', filter.end.getTime()] ,1791 ['<=', 'rangeEnd', filter.end.getTime()] 1790 1792 ], 1791 1793 ['AND', 1792 1794 ['>=', 'rangeStart', filter.start.getTime()], 1793 ['<=', 'rangeStart', filter.end.getTime()] ,1795 ['<=', 'rangeStart', filter.end.getTime()] 1794 1796 ], 1795 1797 ['AND', 1796 1798 ['<=', 'rangeStart', filter.start.getTime()], 1797 ['>=', 'rangeEnd', filter.end.getTime()] ,1799 ['>=', 'rangeEnd', filter.end.getTime()] 1798 1800 ] 1799 1801 ], -
trunk/prototype/modules/calendar/js/calendar.shared.js
r7097 r7164 257 257 text: false 258 258 }).click(function () { 259 incompatibleAcl($(this), ['b' ,], ['busy']);259 incompatibleAcl($(this), ['b'], ['busy']); 260 260 dependsAcl($(this), ['r'], ['read']); 261 261 changeAcl($(this), 's'); … … 454 454 name:resultPublic[i].calendar.name, 455 455 mail: resultPublic[i].calendar.description, 456 owner: resultPublic[i].owner, 456 457 type: 1 457 458 }) … … 470 471 currentCalendars[id] = { 471 472 id: id, 472 name: resultNormalize[i].name ,473 name: resultNormalize[i].name + ' ( '+resultNormalize[i].owner.uid +' )', 473 474 description: resultNormalize[i].description, 474 475 type: resultNormalize[i].type, … … 528 529 id: dataCurrent.id, 529 530 idPermission:Calendar.signatures[i].id , 530 name: dataCurrent.name ,531 description: dataCurrent.description, 531 name: dataCurrent.name + ' ( ' + Calendar.signatures[i].permission.owner.uid + ' )', 532 description: dataCurrent.description, 532 533 type: Calendar.signatures[i].permission.type, 533 534 isCalendar: true, -
trunk/prototype/modules/calendar/templates/calendar_search_itemlist.ejs
r6052 r7164 3 3 <input type="checkbox" name="opcao" <%= (data[i].enabled) ? '' : 'disabled="disabled"' %> /> 4 4 <input type="hidden" value="<%=data[i]['id']%>" /> 5 <label class="name"><%=data[i]['name']%> </label>5 <label class="name"><%=data[i]['name']%> ( <%=data[i]['owner']['uid']%> )</label> 6 6 <label class="mail hidden"><%=data[i]['mail']%></label> 7 7 <label class="id hidden"><%=data[i]['id']%></label>
Note: See TracChangeset
for help on using the changeset viewer.