From: Tim Mallezie <tim.mallezie@chiro.be>
Date: Mon, 2 Mar 2015 07:18:38 +0000 (+0100)
Subject: update eventtype selector to select2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=157e9eb6299672accfc15ada709bdc12cf804437;p=civicrm-core.git

update eventtype selector to select2
---

diff --git a/CRM/Event/Form/SearchEvent.php b/CRM/Event/Form/SearchEvent.php
index 75d8bbc350..7314cf6980 100644
--- a/CRM/Event/Form/SearchEvent.php
+++ b/CRM/Event/Form/SearchEvent.php
@@ -63,9 +63,7 @@ class CRM_Event_Form_SearchEvent extends CRM_Core_Form {
 
     $event_type = CRM_Core_OptionGroup::values('event_type', FALSE);
 
-    foreach ($event_type as $eventId => $eventName) {
-      $this->addElement('checkbox', "event_type_id[$eventId]", 'Event Type', $eventName);
-    }
+    $this->add('select', 'event_type_id', ts('Event type'), $event_type, FALSE, array('class' => 'crm-select2 huge', 'multiple' => TRUE));
 
     $eventsByDates = array();
     $searchOption = array(ts('Show Current and Upcoming Events'), ts('Search All or by Date Range'));
diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 4200cbef45..c4f04490a8 100644
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -461,15 +461,9 @@ ORDER BY start_date desc
     }
 
     $value = $this->get('event_type_id');
-    $val = array();
     if ($value) {
       if (is_array($value)) {
-        foreach ($value as $k => $v) {
-          if ($v) {
-            $val[$k] = $k;
-          }
-        }
-        $type = implode(',', $val);
+        $type = implode(',', $value);
       }
       $clauses[] = "event_type_id IN ({$type})";
     }
diff --git a/templates/CRM/Event/Form/SearchEvent.tpl b/templates/CRM/Event/Form/SearchEvent.tpl
index e1fb50eb3a..9fa62a8487 100644
--- a/templates/CRM/Event/Form/SearchEvent.tpl
+++ b/templates/CRM/Event/Form/SearchEvent.tpl
@@ -34,13 +34,7 @@
              <div style="height: auto; vertical-align: bottom">{$form.eventsByDates.html}</div>
         </td>
         <td rowspan="2"><label>{ts}Event Type{/ts}</label>
-            <div class="listing-box">
-                {foreach from=$form.event_type_id item="event_val"}
-                <div class="{cycle values="odd-row,even-row"}">
-                    {$event_val.html}
-                </div>
-                {/foreach}
-            </div>
+          {$form.event_type_id.html}
         </td>
         <td class="right" rowspan="2">&nbsp;{include file="CRM/common/formButtons.tpl"}</td>
     </tr>