Changeset 5393

Timestamp:

01/18/12 09:45:09 (12 years ago)

Author:

gustavo

Message:

Ticket #2434 - Adicionada validações na tela de importar para a nova agenda

File:

• trunk/expressoMail1_2/js/main.js (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -3364 +3364 @@
                 write_msg(get_lang(data));
     }   
-        if(new_agenda == 'false'){
-                if(confirm(get_lang("Do you confirm this import to your Calendar?"))){
-                        cExecute( import_url +'&from_ajax=true',handler_import_calendar);
-                }
-        }else{                  
+        if(new_agenda == "True" && $("#expressoCalendarid")[0]){
                 $( "#import-dialog" ).dialog({
                         autoOpen: false,
@@ -3407 +3403 @@
                 });
                 $.ajax({
-                                url: '../prototype/modules/calendar/index.php',
-                                async: false,
-                                success: function(){
-                                        $.ajax({
+                        url: '../prototype/modules/calendar/index.php',
+                        async: false,
+                        success: function(){
+                                $.ajax({
                                         url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&readable=true',
                                         async: false,
@@ -3447 +3443 @@
                                                         });
                                                 }
-                                        }});
-                                }});
-                }
-                $( "#import-dialog" ).dialog( "open" );
+                                        }
+                                });
+                        }
+                });
+        }
+        else
+        {                       
+                if(confirm(get_lang("Do you confirm this import to your Calendar?"))){
+                        cExecute( import_url +'&from_ajax=true',handler_import_calendar);
+                }
+        }
+        $( "#import-dialog" ).dialog( "open" );
 }
 function open_msg_part(data){