Changeset 6862

Timestamp:

07/24/12 11:04:34 (11 years ago)

Author:

eduardow

Message:

Ticket #2979 - Erro ao excluir evento ou participante e abrir e-mail de resposta do participante.

Location:

branches/2.4

Files:

• expressoMail1_2/js/main.js (modified) (2 diffs)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)

branches/2.4/expressoMail1_2/js/main.js

@@ -3998 +3998 @@
                                                         var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?");
                                                         $.ajax({
-                                                                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,
+                                                                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(),
                                                                 success: function(msg){
                                                                         if(acceptedSuggestion)
@@ -4028 +4028 @@
                                                                                 
                                                                                 $.ajax({
-                                                                                         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(),
+                                                                                         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(),
                                                                                          success: function(msg){
                                                                                                         alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para " : "Ocorreu um erro ao atualizar o evento" );

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -518 +518 @@
             foreach ($result as $i => $v) {
 
-                if (!isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']]) {
+                if ( isset($v['calendar']) && (!isset($currentTimezone) || $currentTimezone != $original['criteria']['timezones'][$v['calendar']])) {
                     $currentTimezone = isset($original['criteria']['timezones'][$v['calendar']]) ? $original['criteria']['timezones'][$v['calendar']] : $v['timezone'];
                     $Time->setTimezone(new DateTimeZone($currentTimezone));