From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2013 00:59:18 +0000 (-0800)
Subject: CRM-13933 Remove simple search
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2d911cc2abda4a4d94c22663396b739dc8968347;p=civicrm-core.git

CRM-13933 Remove simple search
---

diff --git a/CRM/Contact/Form/Search/Simple.php b/CRM/Contact/Form/Search/Simple.php
deleted file mode 100644
index 7c0efacbc1..0000000000
--- a/CRM/Contact/Form/Search/Simple.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*/
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
- * $Id$
- *
- */
-
-/**
- * Files required
- */
-class CRM_Contact_Form_Search_Simple extends CRM_Core_Form {
-  protected $_params;
-
-  public function preProcess() {
-    $this->assign('rows', $this->get('rows'));
-
-    $this->_params = $this->controller->exportValues($this->_name);
-  }
-
-  public function buildQuickForm() {
-    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'packages/jquery/plugins/jquery.chainedSelects.js', 0, 'html-header', FALSE);
-
-    $this->add('select',
-      'country_id',
-      ts('Country'),
-      array('' => ts('- select -')) + CRM_Core_PseudoConstant::country()
-    );
-
-    $countryID = isset($_POST['country_id']) ? $_POST['country_id'] : NULL;
-    if (!$countryID) {
-      $countryID = isset($this->_params['country_id']) ? $this->_params['country_id'] : NULL;
-    }
-    if ($countryID) {
-      $this->add('select',
-        'state_province_id',
-        ts('State'),
-        array('' => ts('- select a state -')) + CRM_Core_PseudoConstant::stateProvinceForCountry($countryID)
-      );
-    }
-    else {
-      $this->add('select',
-        'state_province_id',
-        ts('State'),
-        array('' => ts('- select a country first -'))
-      );
-    }
-
-    $stateCountryURL = CRM_Utils_System::url('civicrm/ajax/jqState');
-    $this->assign('stateCountryURL', $stateCountryURL);
-    $this->addButtons(array(
-        array(
-          'type' => 'refresh',
-          'name' => ts('Search'),
-          'isDefault' => TRUE,
-        ),
-        array(
-          'type' => 'cancel',
-          'name' => ts('Cancel'),
-        ),
-      )
-    );
-  }
-
-  public function postProcess() {
-    $this->_params = $this->controller->exportValues($this->_name);
-    CRM_Core_Error::debug($this->_params);
-    CRM_Utils_System::civiExit();
-  }
-}
-
diff --git a/CRM/Core/xml/Menu/Contact.xml b/CRM/Core/xml/Menu/Contact.xml
index ce54ca8d42..6e965b272f 100644
--- a/CRM/Core/xml/Menu/Contact.xml
+++ b/CRM/Core/xml/Menu/Contact.xml
@@ -72,11 +72,6 @@
      <page_type>1</page_type>
      <weight>16</weight>
   </item>
-  <item>
-     <path>civicrm/contact/search/simple</path>
-     <title>Simple Search</title>
-     <page_callback>CRM_Contact_Form_Search_Simple</page_callback>
-  </item>
   <item>
      <path>civicrm/contact/add</path>
      <title>New Contact</title>
diff --git a/templates/CRM/Contact/Form/Search/Simple.tpl b/templates/CRM/Contact/Form/Search/Simple.tpl
deleted file mode 100644
index ae7281cad8..0000000000
--- a/templates/CRM/Contact/Form/Search/Simple.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-{literal}
-<script language="JavaScript" type="text/javascript">
-cj(function()
-{
-{/literal}
-        countryID       = '#country_id'
-      stateProvinceID = '#state_province_id'
-        callbackURL     = '{$stateCountryURL}'
-{literal}
-  cj(countryID).chainSelect(stateProvinceID,
-                                  callbackURL,
-                          null);
-});
-</script>
-{/literal}
-<table>
-        <tr>
-            <td class="label">{$form.country_id.label}</td>
-            <td class="nowrap">{$form.country_id.html}</td>
-        </tr>
-        <tr>
-            <td class="label">{$form.state_province_id.label}</td>
-            <td class="nowrap">{$form.state_province_id.html}</td>
-        </tr>
-        <tr>
-            <td colspan=2>{$form.buttons.html}</td>
-        </tr>
-
-</table>