- Timestamp:
- 07/23/12 16:33:19 (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r6814 r6849 3997 3997 var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?"); 3998 3998 $.ajax({ 3999 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&selected=true&cirus_delimiter='+cyrus_delimiter+'&acceptedSuggestion='+acceptedSuggestion+"&from="+document.getElementById('from_values_'+currentTab).value ,3999 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&selected=true&cirus_delimiter='+cyrus_delimiter+'&acceptedSuggestion='+acceptedSuggestion+"&from="+document.getElementById('from_values_'+currentTab).value+'&uidAccount='+decodeOwner(), 4000 4000 success: function(msg){ 4001 4001 if(acceptedSuggestion) … … 4027 4027 4028 4028 $.ajax({ 4029 url: "controller.php?action="+import_url+'&from_ajax=true& selected='+ (parseInt(typeImport) == 2 || parseInt(typeImport) == 4 ? 'true' : $("#select-agenda option:selected").val()) +'&status='+$("#select-status option:selected").val(),4029 url: "controller.php?action="+import_url+'&from_ajax=true&cirus_delimiter='+cyrus_delimiter+'&selected='+ (parseInt(typeImport) == 2 || parseInt(typeImport) == 4 ? 'true' : $("#select-agenda option:selected").val()) +'&status='+$("#select-status option:selected").val()+'&uidAccount='+decodeOwner(), 4030 4030 success: function(msg){ 4031 alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para" : "Ocorreu um erro ao atualizar o evento" );4031 alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso" : "Ocorreu um erro ao atualizar o evento" ); 4032 4032 } 4033 4033 }); -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r6533 r6849 518 518 foreach ($result as $i => $v) { 519 519 520 if ( !isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']]){520 if ( isset($v['calendar']) && (!isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']])) { 521 521 $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone']; 522 522 $Time->setTimezone(new DateTimeZone($currentTimezone));
Note: See TracChangeset
for help on using the changeset viewer.