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

fix links to variety session admin pages

Browse Source
This commit is contained in:
Nathan Coad
2018-05-05 21:47:44 +10:00
parent 69fd7f9541
commit a951c033ee
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
booking.variety_admin.inc
View File

@@ -37,10 +37,10 @@ function booking_variety_admin() {
'booking_variety_status' => $data->booking_variety_status == 1 ? "Enabled" : "Disabled",
'booking_variety_start' => date("Y-m-d H:i", $data->booking_variety_start),
'booking_variety_end' => date("Y-m-d H:i", $data->booking_variety_end),
'variety_edit' => l('Edit Timeslot', t('admin/config/booking/variety/!tid/edit', array('!tid' => $data->tid))),
'variety_session_list' => l('List Sessions', t('admin/config/booking/variety/!tid/session/list', array('!tid' => $data->tid))),
'variety_session_add' => l('Add Session', t('admin/config/booking/variety/!tid/session/create', array('!tid' => $data->tid))),
'variety_session_csv' => l('CSV Report', t('admin/config/booking/variety/!tid/csv', array('!tid' => $data->tid))),
'variety_edit' => l('Edit Timeslot', t('admin/booking/variety/!tid/edit', array('!tid' => $data->tid))),
'variety_session_list' => l('List Sessions', t('admin/booking/variety/!tid/session/list', array('!tid' => $data->tid))),
'variety_session_add' => l('Add Session', t('admin/booking/variety/!tid/session/create', array('!tid' => $data->tid))),
'variety_session_csv' => l('CSV Report', t('admin/booking/variety/!tid/csv', array('!tid' => $data->tid))),
);
}
@@ -71,7 +71,7 @@ function booking_variety_timeslot_form($node, &$form_state, $create, $editid = 0
//verify that $editid is a number
if (! preg_match('/^[0-9]+$/', $editid)) {
drupal_set_message("Error: Invalid variety ID supplied. Unable to update variety session information.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
@@ -201,7 +201,7 @@ function booking_variety_timeslot_form_submit($form, &$form_state) {
->execute();
}
$form_state['redirect'] = array('admin/config/booking/variety');
$form_state['redirect'] = array('admin/booking/variety');
}
/**
@@ -220,13 +220,13 @@ function booking_variety_create_session_form($node, &$form_state, $create = TRUE
//verify that $timeslot_id is a number
if (! preg_match('/^[0-9]+$/', $timeslot_id)) {
drupal_set_message("Error: Invalid timeslot ID supplied. Unable to update specified variety session.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
//verify that $session_id is a number
if (! preg_match('/^[0-9]+$/', $session_id)) {
drupal_set_message("Error: Invalid session ID supplied. Unable to update specified variety session.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
$prefix = t("<p>Update the variety session defintion.</p>");
@@ -312,7 +312,7 @@ function booking_variety_create_session_form_submit($form, &$form_state) {
global $event;
$values = $form_state['input'];
$timeslot_id = $values['tid'];
$redirect_path = "admin/config/booking/variety/$timeslot_id/session/list";
$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']))) {
@@ -375,12 +375,12 @@ function booking_variety_list_session_form($node, &$form_state, $timeslot_id = 0
//verify that $editid is a number
if (! preg_match('/^[0-9]+$/', $timeslot_id)) {
drupal_set_message("Error: Invalid variety ID supplied. Unable to select variety session information.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
$prefix = t("<p>!link</p>",
array ('!link' => l('Add New Variety Session', "admin/config/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');
@@ -407,7 +407,7 @@ function booking_variety_list_session_form($node, &$form_state, $timeslot_id = 0
'booking_variety_status' => $data->booking_variety_status == 1 ? 'Active' : 'Inactive',
'booking_variety_maxsize' => $data->booking_variety_maxsize,
'booking_variety_regncount' => $data->booking_variety_regncount,
'variety_edit' => l('Edit Session', t('admin/config/booking/variety/!tid/session/!vid/edit',
'variety_edit' => l('Edit Session', t('admin/booking/variety/!tid/session/!vid/edit',
array('!tid' => $timeslot_id, '!vid' => $data->vid))),
);
}
@@ -491,7 +491,7 @@ function booking_variety_sessions_view_summary() {
$newline[] = "";
}
} //end iterate variety session timeslot list
$newline[] = l('Edit', t('admin/config/booking/variety/registration/!nid/edit', array('!nid' => $person->nid)));
$newline[] = l('Edit', t('admin/booking/variety/registration/!nid/edit', array('!nid' => $person->nid)));
//add the line to the array of rows
$rows[] = $newline;
@@ -514,7 +514,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
//verify that $timeslot_id is a number
if (! preg_match('/^[0-9]+$/', $timeslot_id)) {
drupal_set_message("Error: Invalid variety session timeslot ID '" . $group_id . "' supplied.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
@@ -531,7 +531,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
//watchdog('booking_debug', 'booking_varietysessions_csv_report variety sessions: <pre>@info</pre>', array('@info' => print_r( $variety_sessions, true)));
if (! $variety_sessions) {
drupal_set_message("Error: Could not find matching variety session timeslot. Unable to view session membership.", 'error', FALSE);
drupal_goto('admin/config/booking/variety');
drupal_goto('admin/booking/variety');
return "";
}
@@ -622,7 +622,7 @@ function booking_variety_regn_edit_form($node, &$form_state, $nid)
global $event;
$form = array();
$data = $node;
$redirect_path = "admin/config/booking/variety/report";
$redirect_path = "admin/booking/variety/report";
//verify that $variety_regn_id is a number
if (! preg_match('/^[0-9]+$/', $nid)) {
@@ -715,7 +715,7 @@ function booking_variety_regn_edit_form_submit($form, &$form_state) {
global $event;
$values = $form_state['input'];
$booking_variety_ids = array();
$redirect_path = "admin/config/booking/variety/report";
$redirect_path = "admin/booking/variety/report";
//get a list of timeslot IDs from matching form values
$variety_timeslot_ids = preg_filter('/^select-variety-(\d+)/', '$1', array_keys( $values ));