CRM-15603 - Standardize punctuation of event checkboxes

[civicrm-core.git] / CRM / Event / Form / ManageEvent / Conference.php

diff --git a/CRM/Event/Form/ManageEvent/Conference.php b/CRM/Event/Form/ManageEvent/Conference.php
index 239eb3a6f3f46eb1a700c39d5e4aa619a8f5e1af..ebf4d311e9c9d31ec8a073a8b16ea9119b154b81 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Conference.php
+++ b/CRM/Event/Form/ManageEvent/Conference.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -50,7 +50,7 @@ class CRM_Event_Form_ManageEvent_Conference extends CRM_Event_Form_ManageEvent {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   function setDefaultValues() {
     $parentDefaults = parent::setDefaultValues();
@@ -64,13 +64,6 @@ class CRM_Event_Form_ManageEvent_Conference extends CRM_Event_Form_ManageEvent {
 
     CRM_Event_BAO_Event::retrieve($params, $defaults);
 
-    if (isset($defaults['parent_event_id'])) {
-      $params = array('id' => $defaults['parent_event_id']);
-      $r_defaults = array();
-      $parent_event = CRM_Event_BAO_Event::retrieve($params, $r_defaults);
-      $defaults['parent_event_name'] = $parent_event->title;
-    }
-
     $defaults = array_merge($defaults, $parentDefaults);
     $defaults['id'] = $eventId;
 
@@ -80,7 +73,7 @@ class CRM_Event_Form_ManageEvent_Conference extends CRM_Event_Form_ManageEvent {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
@@ -94,8 +87,12 @@ class CRM_Event_Form_ManageEvent_Conference extends CRM_Event_Form_ManageEvent {
       FALSE
     );
 
-    $this->addElement('text', 'parent_event_name', ts('Parent Event'));
-    $this->addElement('hidden', 'parent_event_id');
+    $this->addEntityRef('parent_event_id', ts('Parent Event'),  array(
+        'entity' => 'event',
+        'placeholder' => ts('- any -'),
+        'select' => array('minimumInputLength' => 0),
+      )
+    );
 
     parent::buildQuickForm();
   }