Changeset 7597

Timestamp:

12/04/12 08:21:09 (11 years ago)

Author:

acoutinho

Message:

Ticket #3212 - Problema com criação de eventos em conta compartilhada

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (2 diffs)
• helpers.js (modified) (1 diff)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -567 +567 @@
         
         var delegateAttendee = {};
+
+        var myCalendar = function(){
+                for(var i in Calendar.signatures)
+                if(Calendar.signatures[i].isOwner == "1" && Calendar.signatures[i].type == "0")
+                                return Calendar.signatures[i].calendar.id;
+        }
         
         for( var i = 0; i < statusLabels.length; i++ )
@@ -577 +583 @@
 
             var isAttendee = false;
+
+
+            objEvent.calendar = !!objEvent.calendar ? objEvent.calendar : (User.preferences.defaultCalendar ? User.preferences.defaultCalendar : myCalendar());
+
             var Owner = decodeOwnerCalendar(objEvent.calendar);
 

trunk/prototype/modules/calendar/js/helpers.js

@@ -539 +539 @@
 var calendar = DataLayer.get('calendar', objEvent.calendar);
                                 
-if (calendar.timezone != objEvent.timezone){
+if ( (calendar.timezone != objEvent.timezone) && objEvent.id){
     UI.dialogs.addEvent.find('.calendar-addevent-details-txt-timezone').find('option[value="'+objEvent.timezone+'"]').attr('selected','selected').trigger('change');
     UI.dialogs.addEvent.find('.calendar_addevent_details_lnk_timezone').addClass('hidden');