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

possible fixes

Browse Source
This commit is contained in:
Nathan Coad
2016-06-04 10:23:23 +10:00
parent 004123a9e5
commit 8ddbce54c1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
booking.travel.inc
View File

@@ -110,17 +110,18 @@ function travel_form($node, &$form_state, $inserting = FALSE, $node = NULL, $tok
//there's already info in $node so use that //there's already info in $node so use that
if (!empty($node)) { if (!empty($node)) {
$data = $node; $data = $node;
watchdog('booking_debug', "<pre>Travel form not-empty node:\n@info</pre>", array('@info' => print_r( $form_state, true)));
} }
//otherwise rely on the form state from the previous submission //otherwise rely on the form state from the previous submission
else { else {
$data = $form_state['input']; $data = $form_state['node'];
watchdog('booking_debug', "<pre>Travel form:\n@info</pre>", array('@info' => print_r( $form_state, true))); watchdog('booking_debug', "<pre>Travel form empty node:\n@info</pre>", array('@info' => print_r( $data, true)));
} }
//get info about this person from the relevant node id //get info about this person from the relevant node id
$person = db_query("SELECT booking_dietary, booking_medical_conditions, booking_bf_gf_nid, booking_partner_id, booking_room_mate1 " . $person = db_query("SELECT booking_dietary, booking_medical_conditions, booking_bf_gf_nid, booking_partner_id, booking_room_mate1 " .
"FROM {booking_person} " . "WHERE nid = :nid ", "FROM {booking_person} " . "WHERE nid = :nid ",
array(':nid' => isset($node->nid) ? $node->nid : $data->booking_person_nid))->fetchObject(); array(':nid' => $data->nid))->fetchObject();
if ($person) { if ($person) {
$booking_dietary = $person->booking_dietary; $booking_dietary = $person->booking_dietary;
@@ -134,7 +135,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $node = NULL, $tok
//store the node id //store the node id
$form['personid'] = array( $form['personid'] = array(
'#type' => 'hidden', '#type' => 'hidden',
'#value' => $node->nid, '#value' => $data->nid,
); );
$form['travel'] = array( $form['travel'] = array(