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

more formatting tweaks

Browse Source
This commit is contained in:
Nathan Coad
2016-06-24 15:40:41 +10:00
parent f97dd6545d
commit e30f2f7d6f
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
booking.studygroups.inc
View File

@@ -752,7 +752,6 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
$found = TRUE; $found = TRUE;
//if the existing session is not the same as our newly calculated session, run an update query //if the existing session is not the same as our newly calculated session, run an update query
//if ($mapping->booking_session_id !== $person->session && $group->sid != $reading_group_id)
if ($mapping->booking_session_id !== $person->session && $group->booking_is_readinggroup == 'N') { if ($mapping->booking_session_id !== $person->session && $group->booking_is_readinggroup == 'N') {
$message = t('Suggest changing user !id (!name) from session !old to !session. Role id is !role', $message = t('Suggest changing user !id (!name) from session !old to !session. Role id is !role',
array('!id' => $person->nid, '!old' => $mapping->booking_session_id, '!session' => $person->session, array('!id' => $person->nid, '!old' => $mapping->booking_session_id, '!session' => $person->session,
@@ -762,11 +761,8 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
'booking_session_id' => $person->session, 'booking_session_id' => $person->session,
'booking_studygroup_role' => $person->booking_studygroup_role, 'booking_studygroup_role' => $person->booking_studygroup_role,
); );
$updates_to_confirm[] = array('sid' => $mapping->sid, 'fields' => $update); $updates_to_confirm[] = array('sid' => $mapping->sid, 'fields' => $update);
} }
//elseif ($mapping->booking_session_id !== $person->session && $group->sid == $reading_group_id)
elseif ($mapping->booking_session_id !== $person->session && $group->booking_is_readinggroup == 'Y') { elseif ($mapping->booking_session_id !== $person->session && $group->booking_is_readinggroup == 'Y') {
$message = t('Suggest changing user !id (!name) from reading group session !old to !session. Role id is !role', $message = t('Suggest changing user !id (!name) from reading group session !old to !session. Role id is !role',
array('!id' => $person->nid, '!old' => $mapping->booking_session_id, '!session' => $person->session, array('!id' => $person->nid, '!old' => $mapping->booking_session_id, '!session' => $person->session,
@@ -776,13 +772,10 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
'booking_session_id' => $person->session, 'booking_session_id' => $person->session,
'booking_studygroup_role' => $person->booking_studygroup_role, 'booking_studygroup_role' => $person->booking_studygroup_role,
); );
$updates_to_confirm[] = array('sid' => $mapping->sid, 'fields' => $update);
$updates_to_confirm[] = array('sid' => $mapping->sid, 'fields' => $update);
} }
//stop looping through the list since we found a match //stop looping through the list since we found a match
break; break;
} //end checking for existing group session } //end checking for existing group session
} //end looping through study group mappings } //end looping through study group mappings
@@ -800,7 +793,6 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
'booking_session_id' => $person->session, 'booking_session_id' => $person->session,
'booking_studygroup_role' => $person->booking_studygroup_role, 'booking_studygroup_role' => $person->booking_studygroup_role,
); );
} }
//log any update we made //log any update we made