Changeset 7955


Ignore:
Timestamp:
03/05/13 12:26:10 (6 years ago)
Author:
douglas
Message:

Ticket #3355 - ExpressoCalendar? não funciona a contento em diferentes banco de dados

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/prototype/modules/calendar/schedules.php

    r7805 r7955  
    5454                .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, ' 
    5555                .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) ' 
    56                 .'AND (calendar_repeat.object_id = calendar_object.id)) group by calendar_object.id, calendar_to_calendar_object.calendar_id ORDER BY calendar_object.dtstart'; 
     56                .'AND (calendar_repeat.object_id = calendar_object.id)) '  
     57                .'group by  
     58                    calendar_object.id, calendar_object.cal_uid, calendar_object.type_id,  
     59                    calendar_object.dtstart, calendar_object.summary, calendar_object.description,  
     60                    calendar_object.dtend, calendar_object.priority, calendar_object.due, calendar_object.percentage,  
     61                    calendar_object.status, calendar_object.location, calendar_object.allday, calendar_object.transp,  
     62                    calendar_object.class_id, calendar_object.repeat, calendar_object.range_start, calendar_object.range_end,  
     63                    calendar_object.last_update, calendar_object.dtstamp, calendar_object.sequence,  
     64                    calendar_object.tzid, calendar_to_calendar_object.calendar_id  
     65                ORDER BY  
     66                    calendar_object.dtstart';  
    5767 
    5868        $params = Controller::service('PostgreSQL')->execResultSql($sql.$where); 
     
    8292 
    8393 
    84             $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\')))) group by calendar_object.id, calendar_to_calendar_object.calendar_id ORDER BY dtstart LIMIT '.$limit.'  OFFSET '.$offset.' '; 
     94            $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\'))))  
     95                group by  
     96                    calendar_object.id, calendar_object.cal_uid, calendar_object.type_id,  
     97                    calendar_object.dtstart, calendar_object.summary, calendar_object.description,  
     98                    calendar_object.dtend, calendar_object.priority, calendar_object.due, calendar_object.percentage,  
     99                    calendar_object.status, calendar_object.location, calendar_object.allday, calendar_object.transp,  
     100                    calendar_object.class_id, calendar_object.repeat, calendar_object.range_start, calendar_object.range_end,  
     101                    calendar_object.last_update, calendar_object.dtstamp, calendar_object.sequence,  
     102                    calendar_object.tzid, calendar_to_calendar_object.calendar_id  
     103                ORDER BY  
     104                    dtstart LIMIT '.$limit.'  OFFSET '.$offset.' ';  
     105  
    85106            $params = Controller::service('PostgreSQL')->execResultSql($sql.$where); 
    86107 
Note: See TracChangeset for help on using the changeset viewer.