do variety admin query properly

This commit is contained in:
Nathan Coad
2019-09-10 19:01:17 +10:00
parent 92dba91b02
commit 9e72fca856

View File

@@ -14,8 +14,16 @@ function booking_variety_admin() {
// tabledrag example http://dropbucket.org/node/204 // tabledrag example http://dropbucket.org/node/204
$form = array (); $form = array ();
$options = array (); $options = array ();
$result = db_query("SELECT * FROM {booking_variety_timeslots} WHERE booking_eventid = :eid", //$result = db_query("SELECT * FROM {booking_variety_timeslots}");
array(':eid' => $event->eid)); //$result = db_query("SELECT * FROM {booking_variety_timeslots} WHERE booking_eventid = :eid",
// array(':eid' => $event->eid));
$query = db_select('booking_variety_timeslots', 't');
$query->leftJoin('booking_event', 'e', 't.booking_eventid = e.booking_eventid');
$query->fields('t')
->fields('e')
->condition('p.booking_eventid', $event->eid, '=');
$result = $query->execute();
$header = array ( $header = array (
'eid' => t('Event'), 'eid' => t('Event'),
@@ -32,7 +40,7 @@ function booking_variety_admin() {
foreach($result as $data) { foreach($result as $data) {
$options[$data->tid] = array ( $options[$data->tid] = array (
'eid' => $event->booking_eventname, 'eid' => $data->booking_eventname,
'tid' => $data->tid, 'tid' => $data->tid,
'booking_variety_time_descrip' => $data->booking_variety_time_descrip, 'booking_variety_time_descrip' => $data->booking_variety_time_descrip,
'booking_variety_status' => $data->booking_variety_status == 1 ? "Enabled" : "Disabled", 'booking_variety_status' => $data->booking_variety_status == 1 ? "Enabled" : "Disabled",