Merge pull request #101 from cultuurnet/revert-94-feature/WKS-264

Revert "WKS-264: undo revert WKS-260 + add check on searching."
cultuurnet · Aug 16, 2016 · bed262e · bed262e
2 parents 994f05b + 16a5d44
commit bed262e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 41 deletions.
diff --git a/culturefeed_agenda/includes/blocks.inc b/culturefeed_agenda/includes/blocks.inc
@@ -98,6 +98,9 @@ function culturefeed_agenda_search_block_form($form, &$form_state) {
 
   $form = array();
 
+  // Always submit to front, so that searches on a 404 would work.
+  // $form['#action'] = url('<front>');
+
   // Category search.
   if (isset($active_fields['types'])) {
 
@@ -219,11 +222,6 @@ function culturefeed_agenda_search_block_form($form, &$form_state) {
     '#weight' => 200,
   );
 
-  $form['searching'] = array(
-    '#type' => 'hidden',
-    '#value' => TRUE,
-  );
-
   global $user;
   if ($user->uid) {
     $form['#token'] = FALSE;

diff --git a/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php b/culturefeed_agenda/lib/Drupal/AgendaSearchPage.php
@@ -22,12 +22,6 @@ public function initialize() {
     if (empty($this->facetComponent)) {
       $this->facetComponent = new Facet\FacetComponent();
 
-      // If a search form was submitted, immediately return to avoid unnecessary calls to search api.
-      if (!empty($_POST['searching'])) {
-        $this->result = new \CultuurNet\Search\SearchResult();
-        return;
-      }
-
       // Retrieve search parameters and add some defaults.
       $params = drupal_get_query_parameters();
       $params += array(

diff --git a/culturefeed_search_ui/includes/blocks.inc b/culturefeed_search_ui/includes/blocks.inc
@@ -41,11 +41,6 @@ function culturefeed_search_ui_search_block_form($form, & $form_state) {
     '#value' => t('Search'),
   );
 
-  $form['searching'] = array(
-    '#type' => 'hidden',
-    '#value' => TRUE,
-  );
-
   $form_state['searchable_types'] = $searchable_types;
 
   global $user;
@@ -309,7 +304,7 @@ function culturefeed_search_ui_block_city_facet() {
   }
 
   $noresults = FALSE;
-  if (!isset($_POST['searching']) && $culturefeedSearchResult->getTotalCount() == 0) {
+  if ($culturefeedSearchResult->getTotalCount() == 0) {
     $noresults = TRUE;
     // Hide location selector for empty results only when no location was set.
     if (empty($location)) {
@@ -392,11 +387,6 @@ function culturefeed_search_ui_city_facet_form() {
     ),
   );
 
-  $form['searching'] = array(
-    '#type' => 'hidden',
-    '#value' => TRUE,
-  );
-
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Ok'),
@@ -622,11 +612,6 @@ function culturefeed_search_ui_city_only_facet_form() {
     '#attributes' => array('placeholder' => t('Zipcode or city')),
   );
 
-  $form['searching'] = array(
-    '#type' => 'hidden',
-    '#value' => TRUE,
-  );
-
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Ok'),
@@ -878,11 +863,6 @@ function culturefeed_search_ui_block_location_search_form($form, $form_state) {
     '#attributes' => array('class' => array('location-search', 'jquery-ui-autocomplete'), 'placeholder' => t('Zipcode or city')),
   );
 
-  $form['searching'] = array(
-    '#type' => 'hidden',
-    '#value' => TRUE,
-  );
-
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Ok'),

diff --git a/culturefeed_search_ui/includes/pages.inc b/culturefeed_search_ui/includes/pages.inc
@@ -18,11 +18,11 @@ use \Guzzle\Http\Exception;
  */
 function culturefeed_search_ui_search_page($name, $class_name = NULL, $request_type = 'nojs') {
 
-  // If a search form was submitted, immediately return to avoid unnecessary calls to search api.
-  if (!empty($_POST['searching'])) {
+  // The first search page callback is a dummy callback to redirect to the
+  // real search page.
+  if ($name == "submitted") {
     return "";
   }
-
   $ajax = $request_type == 'ajax';
   $rss = $request_type == 'rss';
 

diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -338,12 +338,6 @@ public function initialize() {
     if (empty($this->facetComponent)) {
       $this->facetComponent = new FacetComponent();
 
-      // If a search form was submitted, immediately return to avoid unnecessary calls to search api.
-      if (!empty($_POST['searching'])) {
-        $this->result = new \CultuurNet\Search\SearchResult();
-        return;
-      }
-
       // Retrieve search parameters and add some defaults.
       $params = drupal_get_query_parameters();
       $params += array(