Changeset 6331 for trunk/expressoMail1_2/js/main.js

Timestamp:

05/28/12 21:17:51 (12 years ago)

Author:

acoutinho

Message:

Ticket #2795 - Problema ao tentar aceitar convite da agenda para a conta compartilhada

File:

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

trunk/expressoMail1_2/js/main.js

@@ -3580 +3580 @@
     var logUser;
     var up;
+    var owner;
+    
+    //Verifica o contexto de importação
+    var decodeOwner = function(){
+        
+        owner = User.me.id;
+        var imapBox = openTab.imapBox[currentTab].split('/');
+        if(imapBox.length > 1){
+            var user = DataLayer.get('user', {filter: ['=','uid',imapBox[1]]});             
+            owner = $.isArray(user) ? user[0].id : user.id;
+        }
+        
+        return owner;
+    }
+    
     function handler_import_calendar(data){
             if(data === true){
@@ -3610 +3625 @@
                         closeOnEscape: true
                 });
+                
                 $.ajax({
-                        url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter+'&analize=true',
+                        url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter+'&analize=true&uidAccount='+decodeOwner(),
                         async: false,
                         success: function(data){
@@ -3630 +3646 @@
                                                     $("#select-agenda").html('');
 
-                                                    var shared = '', options = '';
+                                                    var options = '';
 
                                                     if(typeImport == 10){
-                                                        shared = '&fromPermission='+calendarPermission;
-                                                        
-                                                        options += '<option value="'+calendarPermission+'">'+Calendar.signatureOf[calendarPermission].calendar.name+'</option>'
+                                                        for(var i = 0; i < calendarPermission.length; i++)
+                                                            options += '<option value="'+calendarPermission[i]+'">'+Calendar.signatureOf[calendarPermission[i]].calendar.name+'</option>'
                                                     }else{
-                                                        for(var id in Calendar.calendars)
-                                                           options += '<option value="'+Calendar.calendars[id].id+'">'+Calendar.calendars[id].name+'</option>';
-
-                                                        $("#select-agenda").append(options);
+                                                        for(var id in Calendar.signatures)
+                                                           options += parseInt(Calendar.signatures[id].isOwner) ? '<option value="'+Calendar.signatures[id].calendar.id+'">'+Calendar.signatures[id].calendar.name+'</option>' : '';                                                    
                                                     }
+                                                    
+                                                    $("#select-agenda").append(options);
+                                                    $("#select-agenda").css("display", "block");
+                                                    
                                                     $("#import-dialog" ).dialog({
                                                         buttons: {
@@ -3649 +3666 @@
                                                             "Importar" : function(){
                                                                     $.ajax({
-                                                                        url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val()+shared,
+                                                                        url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val()+'&uidAccount='+decodeOwner(),
                                                                         success: function(msg){
                                                                             var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";