Changeset 6498 for trunk

Timestamp:

06/14/12 16:58:53 (12 years ago)

Author:

angelo

Message:

Ticket #2861 - Problema ao excluir lembretes em uma determinada agenda

Location:

trunk/prototype

Files:

• config/calendarSignatureAlarm.ini (modified) (1 diff)
• modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• modules/calendar/js/helpers.js (modified) (4 diffs)
• modules/calendar/templates/configure_calendars_itemlist.ejs (modified) (1 diff)

trunk/prototype/config/calendarSignatureAlarm.ini

@@ -15 +15 @@
 
 [before.delete]
-encodeURICalendarSignatureAlarm = modules/calendar/interceptors/DBMapping.php
+decodeDeleteCalendarSignatureAlarm = modules/calendar/interceptors/DBMapping.php  
 
 [PostgreSQL.mapping]

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -894 +894 @@
         Controller::delete(array('concept' => 'attachment', 'id' => $original['URI']['id']));
     }
+    
+    public function decodeDeleteCalendarSignatureAlarm(&$uri, &$params, &$criteria, $original) {
+                if ($original['URI']['id'] == '' && isset($original['criteria']['filter'])){
+                        Controller::deleteAll(array('concept' => 'calendarSignatureAlarm'), null,$original['criteria']);
+                        return false;
+                }
+    }
 
     public function createDefaultSignature(&$uri, &$result, &$criteria, $original) {

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

@@ -1681 +1681 @@
     var signatures = [];
     var previewActiveCalendarConf = 0;
-
+        var calendarAlarms = [];
+        
     for (var i=0; i<Calendar.signatures.length; i++) {
         calendars[i]  = Calendar.signatures[i].calendar;
@@ -1726 +1727 @@
                 });
             form_content.find('.button').button();
-                                
+            jQuery('.preferences-alarms-list').find('.button.remove').click(function(el){
+                        calendarAlarms[calendarAlarms.length] = $(this).parent('li').find('input[name="alarmId[]"]').val();
+                        $(this).parent().remove();
+                });
+        
                 DataLayer.render( 'templates/timezone_list.ejs', {}, function( timezones_options ){
                     var valueTimeZone = calendars[nowActive].timezone;
@@ -1844 +1849 @@
     var template_content = jQuery('#configure_tab').html( template ).find('.configure-calendars-win');
     template_content.find('.button').button().filter('.save').click(function(evt){
+        if(calendarAlarms.length)
+                DataLayer.removeFilter('calendarSignatureAlarm', {filter: ['IN','id', calendarAlarms]});        
         template_content.find('form').submit();
         $tabs.tabs( "remove", "#configure_tab");
@@ -1851 +1858 @@
             refresh_calendars();
         });
+        if(calendarAlarms.length)
+                Calendar.load();
     }).end().filter('.cancel').click(function(evt){
         $tabs.tabs( "remove", "#configure_tab");

trunk/prototype/modules/calendar/templates/configure_calendars_itemlist.ejs

@@ -87 +87 @@
                                                         <input type="hidden" name="alarmId[]" value="<%=data.signature.defaultAlarms[i].id%>" />
                                                         <label>antes de cada evento.</label>
-                                                        <a class="button remove small">Excluir</a>
+                                                        <a class="button remove tiny">Excluir</a>
                                                 </li>
                                                 <%}%>