[Fmsystem-commits] [14640] more on bookingfrontend

[Sigurd Nes]

Revision: 14640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14640
Author:   sigurdne
Date:     2016-01-13 12:27:58 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
more on bookingfrontend

Modified Paths:
--------------
    branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
    branches/dev-syncromind/bookingfrontend/templates/base/search.xsl

Modified: branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php  
2016-01-13 12:04:34 UTC (rev 14639)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php  
2016-01-13 12:27:58 UTC (rev 14640)
@@ -151,7 +151,7 @@
 //                     _debug_array($activity_criteria);
 //                     _debug_array($criteria);
 //                     die();
-                       if($searchterm || $building_id || $activity_criteria || 
$filter_part_of_town)
+                       if($searchterm || $building_id || $activity_criteria || 
$filter_part_of_town || phpgw::get_var('filter_search_type'))
                        {
                                $data = array(
                                        'results' => 
$this->bo->search($searchterm, $building_id, $filter_part_of_town, 
$activity_criteria)

Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-13 12:04:34 UTC (rev 14639)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-13 12:27:58 UTC (rev 14640)
@@ -41,7 +41,7 @@
                                </li>
                                <li>
                                        <label>
-                                               <input type="checkbox" 
name="search_type[]" value="resource" checked="checked"/>
+                                               <input type="checkbox" 
name="search_type[]" value="resource"/>
                                                <xsl:value-of 
select="php:function('lang', 'resource')" />
                                        </label>
                                </li>