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

disable variety timeslots of non-active event

Browse Source
This commit is contained in:
Nathan Coad
2019-09-10 19:32:30 +10:00
parent a3472d6fb4
commit 0cb58768c3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
booking.variety_admin.inc
View File

@@ -317,7 +317,14 @@ function booking_variety_create_session_form_submit($form, &$form_state) {
global $event;
$values = $form_state['input'];
$timeslot_id = $values['tid'];
$redirect_path = "admin/booking/variety/$timeslot_id/session/list";
//verify that $timeslot_id is a number
if (! preg_match('/^[0-9]+$/', $timeslot_id)) {
$redirect_path = "admin/booking/variety";
}
else {
$redirect_path = "admin/booking/variety/$timeslot_id/session/list";
}
//if we're deleting, add the confirmation to the form if it hasn't been defined yet
if($form_state['values']['op'] == 'Delete Session' && (!isset($form_state['storage']['confirm']))) {
@@ -385,7 +392,7 @@ function booking_variety_list_session_form($node, &$form_state, $timeslot_id = 0
}
$prefix = t("<p>!link</p>",
array ('!link' => l('Add New Variety Session', "admin/booking/variety/$timeslot_id/session/create")));
array('!link' => l('Add New Variety Session', "admin/booking/variety/$timeslot_id/session/create")));
$query = db_select ('booking_variety_sessions', 'v');
$query->join('booking_variety_timeslots', 't', 'v.booking_variety_timeslot_id = t.tid');
@@ -528,7 +535,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
//retrieve the sessions for the specified timeslot
$db_and = db_and();
$db_and->condition('v.booking_eventid', $event->eid, '=');
//$db_and->condition('v.booking_eventid', $event->eid, '=');
$db_and->condition('v.booking_variety_timeslot_id', $timeslot_id, '=');
$variety_sessions = db_select('booking_variety_sessions', 'v')
->condition($db_and)