Changeset 5384 for trunk/prototype/modules/calendar/js/helpers.js

Timestamp:

01/17/12 14:07:38 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Melhorias e correcoes de bugs na nova agenda

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (6 diffs)

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

@@ -597 +597 @@
                                         
                                         
-                                        var isExternal = (user) ? user.isExternal : 1;
+                                        var isExternal = (!!user && !!user.isExternal) ? 0 : 1;
 
                                         /**
@@ -610 +610 @@
                                         if (user){
                                                 if (!skipAddNewLine) {
-                                                        user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: 1});
+                                                        user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: isExternal});
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
                                                                 DataLayer.render('templates/participants_add_itemlist.ejs', user)
@@ -1077 +1077 @@
                                 }
                                 DataLayer.remove('calendarSignature', signature);
+                                if(idCalendar == User.preferences.defaultCalendar)
+                                        DataLayer.remove( 'modulePreference', User.preferenceIds['defaultCalendar']);
                                 $('.positionHelper').css('display', 'none');
                         }else{
@@ -1176 +1178 @@
                                         user: User.me.id,
                                         calendar: {
-                                                name: $('.qtip-active input').val(),
+                                                name: Encoder.htmlEncode($('.qtip-active input').val()),
                                                 timezone: User.preferences.timezone                             
                                         },
@@ -1239 +1241 @@
                         }
                         
-                        if(Calendar.currentView){
+                         if(Calendar.currentView){
                                 var checkBox = $(this);
-                                Calendar.currentView[ checkBox.val() ].hidden = !checkBox.is(':checked');
-                                $('#calendar').fullCalendar( 'refetchEvents' );
-                        }               
+                if(!!Calendar.currentView[ checkBox.val() ]){
+                                        Calendar.currentView[ checkBox.val() ].hidden = !checkBox.is(':checked');
+                                        $('#calendar').fullCalendar( 'refetchEvents' );
+                                }
+                        }
             });
       });
@@ -1526 +1530 @@
                         $('.import-event-form', UI.dialogs.importCalendar).submit();                    
                         UI.dialogs.importCalendar.dialog("close");
+                        isValidCalback = true;
                         /**
                          * TODO - implementar ação de importação