From 5dff0278012086970889f808295d24adc178a010 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Sun, 17 Mar 2013 20:29:09 -0700 Subject: [PATCH] CRM-12134 --- CRM/Event/Page/ICalendar.php | 2 ++ .../Page/ParticipantListing/NameStatusAndDate.php | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CRM/Event/Page/ICalendar.php b/CRM/Event/Page/ICalendar.php index 957d69ba7e..b9c89a2ff2 100644 --- a/CRM/Event/Page/ICalendar.php +++ b/CRM/Event/Page/ICalendar.php @@ -58,6 +58,8 @@ class CRM_Event_Page_ICalendar extends CRM_Core_Page { $html = CRM_Utils_Request::retrieve('html', 'Positive', $this, FALSE, 0); $rss = CRM_Utils_Request::retrieve('rss', 'Positive', $this, FALSE, 0); + CRM_Utils_System::setTitle(ts('Current and Upcoming Events')); + $info = CRM_Event_BAO_Event::getCompleteInfo($start, $type, $id, $end); $this->assign('events', $info); $this->assign('timezone', @date_default_timezone_get()); diff --git a/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php b/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php index 56134ed692..6b1dc648f2 100644 --- a/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php +++ b/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php @@ -41,7 +41,7 @@ class CRM_Event_Page_ParticipantListing_NameStatusAndDate extends CRM_Core_Page protected $_eventTitle; protected $_pager; - + function preProcess() { $this->_id = CRM_Utils_Request::retrieve('id', 'Integer', $this, TRUE); @@ -70,7 +70,7 @@ class CRM_Event_Page_ParticipantListing_NameStatusAndDate extends CRM_Core_Page $fromClause = " FROM civicrm_contact -INNER JOIN civicrm_participant ON civicrm_contact.id = civicrm_participant.contact_id +INNER JOIN civicrm_participant ON civicrm_contact.id = civicrm_participant.contact_id INNER JOIN civicrm_event ON civicrm_participant.event_id = civicrm_event.id "; @@ -99,14 +99,15 @@ LIMIT $offset, $rowCount"; $object = CRM_Core_DAO::executeQuery($query, $params); $statusLookup = CRM_Event_PseudoConstant::participantStatus(); while ($object->fetch()) { + $status = CRM_Utils_Array::value($object->status_id, $statusLookup); + if ($status) { + $status = ts($status); + } $row = array( 'id' => $object->contact_id, 'participantID' => $object->participant_id, 'name' => $object->name, - 'email' => $object->email, - 'status' => CRM_Utils_Array::value($object->status_id, - $statusLookup - ), + 'status' => $status, 'date' => $object->register_date, ); $rows[] = $row; -- 2.25.1