Changeset 7598 for branches


Ignore:
Timestamp:
12/04/12 10:16:53 (7 years ago)
Author:
douglas
Message:

Ticket #3212 - Problema com criação de eventos em contas compartilhadas

Location:
branches/2.4/prototype/modules/calendar/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/prototype/modules/calendar/js/calendar.codecs.js

    r7594 r7598  
    566566         
    567567        var delegateAttendee = {}; 
     568 
     569        var myCalendar = function(){  
     570                for(var i in Calendar.signatures)  
     571                if(Calendar.signatures[i].isOwner == "1" && Calendar.signatures[i].type == "0")  
     572                        return Calendar.signatures[i].calendar.id;  
     573        } 
    568574         
    569575        for( var i = 0; i < statusLabels.length; i++ ) 
     
    576582 
    577583            var isAttendee = false; 
     584 
     585            objEvent.calendar = !!objEvent.calendar ? objEvent.calendar : (User.preferences.defaultCalendar ? User.preferences.defaultCalendar : myCalendar()); 
     586 
    578587            var Owner = decodeOwnerCalendar(objEvent.calendar); 
    579588 
  • branches/2.4/prototype/modules/calendar/js/helpers.js

    r7461 r7598  
    539539var calendar = DataLayer.get('calendar', objEvent.calendar); 
    540540                                 
    541 if (calendar.timezone != objEvent.timezone){ 
     541if ( (calendar.timezone != objEvent.timezone) && objEvent.id){ 
    542542    UI.dialogs.addEvent.find('.calendar-addevent-details-txt-timezone').find('option[value="'+objEvent.timezone+'"]').attr('selected','selected').trigger('change'); 
    543543    UI.dialogs.addEvent.find('.calendar_addevent_details_lnk_timezone').addClass('hidden'); 
Note: See TracChangeset for help on using the changeset viewer.