drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

reduce unnecessary db query

Browse Source
This commit is contained in:
Nathan Coad
2018-01-14 11:31:09 +11:00
parent 9ac1c170a0
commit 51bf95dfeb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booking.travel.inc
View File

@@ -134,7 +134,9 @@ function travel_form($node, &$form_state, $db_node = NULL, $inserting = FALSE, $
$booking_medical_conditions = $person->booking_medical_conditions; $booking_medical_conditions = $person->booking_medical_conditions;
//an empty value is zero in this case //an empty value is zero in this case
$booking_bf_gf_nid = $person->booking_bf_gf_nid == 0 ? '' : $person->booking_bf_gf_nid; $booking_bf_gf_nid = $person->booking_bf_gf_nid == 0 ? '' : $person->booking_bf_gf_nid;
$booking_partner_id = $person->booking_partner_id == 0 ? '' : $person->booking_partner_id;
$booking_roommate = $person->booking_room_mate1; $booking_roommate = $person->booking_room_mate1;
} }
else { else {
watchdog('booking_debug', "<pre>Failed to retrieve person from database using nid from data variable:\n@info</pre>", array('@info' => print_r( $data, true))); watchdog('booking_debug', "<pre>Failed to retrieve person from database using nid from data variable:\n@info</pre>", array('@info' => print_r( $data, true)));
@@ -146,6 +148,7 @@ function travel_form($node, &$form_state, $db_node = NULL, $inserting = FALSE, $
$booking_medical_conditions = $data->booking_medical_conditions; $booking_medical_conditions = $data->booking_medical_conditions;
//an empty value is zero in this case //an empty value is zero in this case
$booking_bf_gf_nid = $data->booking_bf_gf_nid == 0 ? '' : $data->booking_bf_gf_nid; $booking_bf_gf_nid = $data->booking_bf_gf_nid == 0 ? '' : $data->booking_bf_gf_nid;
$booking_partner_id = $data->booking_partner_id == 0 ? '' : $data->booking_partner_id;
$booking_roommate = $data->booking_room_mate1; $booking_roommate = $data->booking_room_mate1;
} }
@@ -308,8 +311,8 @@ function travel_form($node, &$form_state, $db_node = NULL, $inserting = FALSE, $
//calculate which fields to show and whether we need to show the fieldset at all //calculate which fields to show and whether we need to show the fieldset at all
$show_dietary = ((variable_get('booking_enable_dietary', 0) == 1) || ($inserting == FALSE)); $show_dietary = ((variable_get('booking_enable_dietary', 0) == 1) || ($inserting == FALSE));
$show_medical = ((variable_get('booking_enable_medcond', 0) == 1) || ($inserting == FALSE)); $show_medical = ((variable_get('booking_enable_medcond', 0) == 1) || ($inserting == FALSE));
$show_roommate = (variable_get('booking_enable_roommate', 0) == 1 && $person->booking_partner_id == 0) || $inserting == FALSE; $show_roommate = (variable_get('booking_enable_roommate', 0) == 1 && $booking_partner_id == 0) || $inserting == FALSE;
$show_bf_gf = $person->booking_partner_id == 0 || $inserting == FALSE; $show_bf_gf = $booking_partner_id == 0 || $inserting == FALSE;
$show_special_requirements = ($show_dietary || $show_medical || $show_roommate || $show_bf_gf); $show_special_requirements = ($show_dietary || $show_medical || $show_roommate || $show_bf_gf);
if ($show_special_requirements) { if ($show_special_requirements) {