more progress on room allocation pages

This commit is contained in:
2014-05-27 15:58:50 +10:00
parent 773ba5a101
commit 2a3d29aa3b
5 changed files with 177 additions and 78 deletions

View File

@@ -1093,8 +1093,8 @@ function booking_load_query($node_ids = NULL, $fetchAssoc = FALSE)
$query->fields('p')
->fields('t')
->fields('pr', array('booking_price', 'booking_price_descrip','booking_late_price'))
->fields('rm', array('booking_roomid', 'booking_room_bedtype'))
->fields('r', array('rid','booking_room_location_id', 'booking_room_number'));
->fields('rm', array('booking_room_bedtype'))
->fields('r', array('booking_room_location_id', 'booking_room_number'));
//now add the study group fields if applicable
if (variable_get('booking_enable_studygroups', 0) == 1)