Changeset 7405 for trunk/prototype/modules
- Timestamp:
- 10/10/12 12:32:02 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7377 r7405 653 653 static function createParticipantHistoric(&$uri, &$params, &$criteria, $original){ 654 654 655 if(isset($original['properties']) && $original['properties']['isOrganizer'] != '1'){655 if(isset($original['properties']) && isset($original['properties']['isOrganizer']) && $original['properties']['isOrganizer'] != '1'){ 656 656 if(!isset($criteria['event'])){ 657 657 $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable'])); -
trunk/prototype/modules/calendar/js/activity.helpers.js
r7269 r7405 645 645 }) 646 646 .click(function(){ 647 blkAdd Atendee.find('dd.task-activity-list').qtip('destroy');647 blkAddTask.find('dd.task-activity-list').qtip('destroy'); 648 648 }); 649 649 650 650 $('.qtip-active .button.cancel').button().click(function(){ 651 blkAdd Atendee.find('dd.activity-list [type=checkbox]').attr('checked', false);652 blkAdd Atendee.find('dd.activity-list').qtip('destroy');651 blkAddTask.find('dd.activity-list [type=checkbox]').attr('checked', false); 652 blkAddTask.find('dd.activity-list').qtip('destroy'); 653 653 }); 654 654 -
trunk/prototype/modules/calendar/js/helpers.js
r7394 r7405 1710 1710 1711 1711 form_content.find('.button-add-alarms').click(function(){ 1712 DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 0}, function( template ){1712 DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: (parseInt(type) == 1 ? '4' : type) }, function( template ){ 1713 1713 jQuery('.preferences-alarms-list').append(template) 1714 1714 .find('li:last label:eq(0)').remove().end() -
trunk/prototype/modules/calendar/templates/alarms_add_itemlist.ejs
r7269 r7405 43 43 <%}else if (parseInt(data.type) == 1){%> 44 44 <label>antes de cada tarefa.</label> 45 <%}else{%> 45 <%}else if(parseInt(data.type) == 4){%> 46 <label>antes de cada tarefa ou atividade.</label> 47 <%}else{%> 46 48 <label>antes de cada atividade.</label> 47 49 <%}%> -
trunk/prototype/modules/calendar/templates/configure_calendars_itemlist.ejs
r6996 r7405 101 101 <label>antes de cada evento.</label> 102 102 <%}else{%> 103 <label>antes de cada tarefa .</label>103 <label>antes de cada tarefa ou atividade.</label> 104 104 <%}%> 105 105 <a class="button remove tiny">Excluir</a>
Note: See TracChangeset
for help on using the changeset viewer.