Changeset 7416 for branches/2.4

Timestamp:

10/15/12 10:20:04 (12 years ago)

Author:

eduardow

Message:

Ticket #3122 - Inconsistencias na criação de grupos, erros sendo apresentados no javaScript

Location:

branches/2.4/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• js/activity.helpers.js (modified) (1 diff)
• js/helpers.js (modified) (1 diff)
• templates/alarms_add_itemlist.ejs (modified) (1 diff)
• templates/configure_calendars_itemlist.ejs (modified) (1 diff)

branches/2.4/prototype/modules/calendar/interceptors/DBMapping.php

@@ -653 +653 @@
     static function createParticipantHistoric(&$uri, &$params, &$criteria, $original){
 
-        if(isset($original['properties']) && $original['properties']['isOrganizer'] != '1'){
+        if(isset($original['properties']) && isset($original['properties']['isOrganizer']) && $original['properties']['isOrganizer'] != '1'){
             if(!isset($criteria['event'])){
                 $event = Controller::read(array('concept' => 'schedulable', 'id' => $original['properties']['schedulable']));

branches/2.4/prototype/modules/calendar/js/activity.helpers.js

@@ -645 +645 @@
                 })
                 .click(function(){
-                    blkAddAtendee.find('dd.task-activity-list').qtip('destroy');
+                    blkAddTask.find('dd.task-activity-list').qtip('destroy');
                 });
                                         
                 $('.qtip-active .button.cancel').button().click(function(){
-                    blkAddAtendee.find('dd.activity-list [type=checkbox]').attr('checked', false);
-                    blkAddAtendee.find('dd.activity-list').qtip('destroy');
+                    blkAddTask.find('dd.activity-list [type=checkbox]').attr('checked', false); 
+                    blkAddTask.find('dd.activity-list').qtip('destroy');
                 });
 

branches/2.4/prototype/modules/calendar/js/helpers.js

@@ -1710 +1710 @@
 
                 form_content.find('.button-add-alarms').click(function(){
-                    DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: 0}, function( template ){                                             
+                    DataLayer.render( 'templates/alarms_add_itemlist.ejs', {type: (parseInt(type) == 1 ? '4' : type) }, function( template ){                                           
                         jQuery('.preferences-alarms-list').append(template)
                         .find('li:last label:eq(0)').remove().end()

branches/2.4/prototype/modules/calendar/templates/alarms_add_itemlist.ejs

@@ -43 +43 @@
                         <%}else if (parseInt(data.type) == 1){%> 
                         <label>antes de cada tarefa.</label>
-                <%}else{%>
+                <%}else if(parseInt(data.type) == 4){%> 
+            <label>antes de cada tarefa ou atividade.</label> 
+            <%}else{%>
                         <label>antes de cada atividade.</label> 
             <%}%> 

branches/2.4/prototype/modules/calendar/templates/configure_calendars_itemlist.ejs

@@ -101 +101 @@
                                                         <label>antes de cada evento.</label>
                                                 <%}else{%>
-                                                        <label>antes de cada tarefa.</label>
+                                                        <label>antes de cada tarefa ou atividade.</label>
                                                 <%}%>
                                                         <a class="button remove tiny">Excluir</a>