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

Timestamp:

03/19/12 16:38:05 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao na edicao de repeticao com n repeticoes

File:

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

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

@@ -657 +657 @@
                         canDiscardEventDialog = true;
                         
-                        var exit = function(){
+                        var exit = function(event){
+                            if(event)
+                                DataLayer.remove('schedulable', event, false); 
+
                             UI.dialogs.addEvent.children().find('form.form-addevent').submit();
                             UI.dialogs.addEvent.dialog("close");
@@ -665 +668 @@
                                DataLayer.remove('repeat', false);
                                DataLayer.put('repeat', repeat);
-                               DataLayer.commit('repeat', false, exit);
+                               DataLayer.commit('repeat', false, exit(repeat.schedulable));
                         }else
                             exit();
@@ -1628 +1631 @@
 
     edit.repeat.startTime = new Date(parseInt(edit.repeat.startTime)).toString('yyyy-MM-dd HH:mm:00');
-    edit.repeat.endTime = new Date(parseInt(edit.repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
+    edit.repeat.endTime = parseInt(edit.repeat.count) > 0 ? '0' : new Date(parseInt(edit.repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
     
     edit.repeat.exceptions = (schedulable.occurrences[idException]);