From 14c89ba8e8b39a19e477b81512e790abe6301630 Mon Sep 17 00:00:00 2001
From: yashodha <yashodha.chaku@webaccess.co.in>
Date: Fri, 13 Sep 2013 11:58:19 +0530
Subject: [PATCH] CRM-13386

---
 CRM/Event/Page/ManageEvent.php           | 4 +++-
 templates/CRM/Event/Page/ManageEvent.tpl | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index c84f1fb5e9..33fd345852 100644
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -296,7 +296,7 @@ ORDER BY start_date desc
     );
     $this->assign('eventCartEnabled', $enableCart);
     $mappingID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_ActionMapping', 'civicrm_event', 'id', 'entity_value');
-
+    $eventType = CRM_Core_OptionGroup::values('event_type');
     while ($dao->fetch()) {
       if (in_array($dao->id, $permissions[CRM_Core_Permission::VIEW])) {
         $manageEvent[$dao->id] = array();
@@ -347,8 +347,10 @@ ORDER BY start_date desc
         $manageEvent[$dao->id]['campaign'] = CRM_Utils_Array::value($dao->campaign_id, $allCampaigns);
         $manageEvent[$dao->id]['reminder'] = CRM_Core_BAO_ActionSchedule::isConfigured($dao->id, $mappingID);
         $manageEvent[$dao->id]['is_pcp_enabled'] = CRM_Utils_Array::value($dao->id, $eventPCPS);
+        $manageEvent[$dao->id]['event_type'] = CRM_Utils_Array::value($manageEvent[$dao->id]['event_type_id'], $eventType);
       }
     }
+
     $manageEvent['tab'] = self::tabs($enableCart);
     $this->assign('rows', $manageEvent);
 
diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl
index 5c4307db11..d8c40153f5 100644
--- a/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/templates/CRM/Event/Page/ManageEvent.tpl
@@ -68,6 +68,7 @@
         <th>{ts}Event{/ts}</th>
         <th>{ts}City{/ts}</th>
         <th>{ts}State/Province{/ts}</th>
+        <th>{ts}Type{/ts}</th>
         <th>{ts}Public?{/ts}</th>
         <th>{ts}Starts{/ts}</th>
         <th>{ts}Ends{/ts}</th>
@@ -89,6 +90,7 @@
           </td>
           <td class="crm-event-city">{$row.city}</td>
           <td class="crm-event-state_province">{$row.state_province}</td>
+          <td class="crm-event-event_type">{$row.event_type}</td>
           <td class="crm-event-is_public">{if $row.is_public eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td class="crm-event-start_date">{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
           <td class="crm-event-end_date">{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
-- 
2.25.1