This commit is contained in:
2016-06-28 13:36:22 +10:00
parent 3694e37db4
commit d6619aa5ee

View File

@@ -411,6 +411,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
global $event; global $event;
$rows = array(); $rows = array();
$form = array(); $form = array();
$prefix = t("<h2>Room Allocations for !room</h2>", array('!room' => $location_description->booking_roomlocation_descrip));
//verify that $location_id is a number //verify that $location_id is a number
if (! preg_match('/^[0-9]+$/', $location_id)) { if (! preg_match('/^[0-9]+$/', $location_id)) {
@@ -420,14 +421,14 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
return ""; return "";
} }
//@todo reduce the number of queries by using some joins
$location_description = db_query("SELECT booking_roomlocation_descrip FROM {booking_room_locations} where lid = :id", $location_description = db_query("SELECT booking_roomlocation_descrip FROM {booking_room_locations} where lid = :id",
array(':id' => $location_id)) array(':id' => $location_id))
->fetchObject(); ->fetchObject();
$prefix = t("<h2>Room Allocations for !room</h2>", array('!room' => $location_description->booking_roomlocation_descrip));
//query for room definitions //query for room definitions
$room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid", $room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid ORDER BY booking_room_number",
array(':lid' => $location_id)); array(':lid' => $location_id));
//query for existing room allocations //query for existing room allocations