Changeset 6885 for sandbox/2.4.2-expresso1
- Timestamp:
- 07/26/12 16:00:19 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/prototype/modules/calendar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js
r6880 r6885 712 712 taskStatus: objEvent.status, 713 713 groups: Calendar.groups, 714 group: objEvent.group ,714 group: objEvent.group ? objEvent.group : objEvent.calendar, 715 715 summary: objEvent.summary, 716 716 type: !!objEvent.type ? objEvent.type : 2, -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js
r6883 r6885 2069 2069 delete Calendar.currentViewKey; 2070 2070 Calendar.load(); 2071 refresh_calendars( );2071 refresh_calendars(type); 2072 2072 }); 2073 2073 } … … 2078 2078 } 2079 2079 2080 function refresh_calendars( ){2080 function refresh_calendars(type){ 2081 2081 2082 2082 var colorsSuggestions = colors_suggestions(); … … 2308 2308 2309 2309 $('.calendar-view').click(function(evt){ 2310 if($tabs.tabs('option' ,'selected') == 1){2311 pageselectCallback('', 0 );2310 if($tabs.tabs('option' ,'selected') != 0){ 2311 pageselectCallback('', 0, false, type); 2312 2312 } 2313 2313 … … 2566 2566 function pageselectCallback(keyword, page_index, view, type){ 2567 2567 $('.qtip.qtip-blue').remove(); 2568 2569 2568 var tab_selector = ['tab_events_list_', 'tab_tasks_list_', 'tab_all_list_']; 2570 2569 var tab_title = ['Lista de eventos', 'Lista de tarefas']; … … 2625 2624 var eventId = $(this).siblings('[name="eventid"]').val(); 2626 2625 var calendarId = $(this).siblings('[name="calendarid"]').val(); 2627 2628 2626 remove_event(eventId, calendarId); 2629 2627 }) -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/load.js
r6876 r6885 93 93 contentMenu(); 94 94 }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0) 95 pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0); 95 96 pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0, false, ($tabs.tabs('option' ,'selected') > 2) ? 2 : ($tabs.tabs('option' ,'selected') == 1) ? 0 : 1); 96 97 } 97 98 } -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_list.ejs
r6880 r6885 232 232 <input name="eventid" type="hidden" value="<%=_event.id%>"></input> 233 233 <input name="eventtype" type="hidden" value="<%=_event.type%>"></input> 234 <input name="calendarid" type="hidden" value="<%=_event.calendar %>"></input>234 <input name="calendarid" type="hidden" value="<%=_event.calendar ? _event.calendar : _event.group%>"></input> 235 235 <a title="Excluir" class="button delete" href="#">Excluir</a> 236 236 <a title="Editar" class="button edit" href="#">Editar</a>
Note: See TracChangeset
for help on using the changeset viewer.