[Fmsystem-commits] [8405] bkbooking: nsf update bugsfix

[Kjell Arne Espedal]

Revision: 8405
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8405
Author:   kjell
Date:     2011-12-21 14:30:08 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
bkbooking: nsf update bugsfix

Modified Paths:
--------------
    branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
    branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js

Modified: branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php    
2011-12-21 14:16:12 UTC (rev 8404)
+++ branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php    
2011-12-21 14:30:08 UTC (rev 8405)
@@ -84,8 +84,8 @@
                        $resource['region'] = phpgw::get_var('regions', 'GET', 
null);
        
                        $search = null;
-                       
-                       if (strlen($searchterm) || $type || $resource['res'] || 
$resource['fylke'])
+
+                       if (strlen($searchterm) || $type || $resource['res'] || 
$resource['fylke'] || $resource['region'])
                        {
                                $search = array(
                                        'results'    => 
$this->bo->search($searchterm,$resource),

Modified: branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js  
2011-12-21 14:16:12 UTC (rev 8404)
+++ branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js  
2011-12-21 14:30:08 UTC (rev 8405)
@@ -203,18 +203,22 @@
 
                        if (this.id == 'field_type') {
                                if(['House'].indexOf(val) >= 0) {
+                                       ResetCampsites();
                                        
YAHOO.util.Dom.setStyle('field_bedspaces', 'display', 'inline');        
                                        
YAHOO.util.Dom.setStyle('field_campsites', 'display', 'none');  
                                        ResetBeds();
                                } 
                                else if 
(['Location','Campsite','Boat'].indexOf(val) >= 0) 
                                {
+                                       ResetBeds();
                                        
YAHOO.util.Dom.setStyle('field_bedspaces', 'display', 'none');  
                                        
YAHOO.util.Dom.setStyle('field_campsites', 'display', 'inline');        
                                        ResetCampsites();
                                }
                                else if (['Equipment',''].indexOf(val) >= 0)    
        
                                {
+                                       ResetBeds();
+                                       ResetCampsites();
                                        
YAHOO.util.Dom.setStyle('field_bedspaces', 'display', 'none');  
                                        
YAHOO.util.Dom.setStyle('field_campsites', 'display', 'none');  
                                }
@@ -255,7 +259,6 @@
                if (oInput.value == 'Søk leirplass, hytte, utstyr eller 
aktivitet') {
                        oInput.value = '';              
                }
-                       
     });
 
 };