From fd084499b4645bc62481e1bcd129698b1c888926 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 3 Jun 2016 11:17:32 +1000 Subject: [PATCH] add test --- booking.emails_admin.inc | 8 ++++++-- booking.js | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc index cb52e6c..2752342 100644 --- a/booking.emails_admin.inc +++ b/booking.emails_admin.inc @@ -284,8 +284,9 @@ function booking_manual_email_form($form, &$form_state, $input_option = "") $email_options_array['remindertravelrequired'] = 'Reminder Travel Form Required Email'; $email_options_array['travelcomplete'] = 'Travel Form Complete Email'; $preselection_options['---'] = "---"; - $preselection_options['bookedin'] = 'bookedin'; - + $preselection_options['bookedin'] = 'Status of Booked In'; + $preselection_options['test'] = 'Testing'; + //add in the custom email types for ($i = 1; $i <= variable_get('booking_custom_email_count','5'); $i++) { @@ -483,6 +484,9 @@ function _booking_email_get_default_selection_callback($form, $form_state) { if ($selection == 'bookedin' && $person->booking_status == 1) { $defaults[] = $person->nid; } + elseif ($selection == 'test' && $person->booking_lastname == 'Coad') { + $defaults[] = $person->nid; + } } //set return value via drupal_json_encode($var) $replacementform_data['booking-email-default-ids'] = array ( diff --git a/booking.js b/booking.js index 68a4d4b..9c158b4 100644 --- a/booking.js +++ b/booking.js @@ -2,13 +2,11 @@ * Special Effects AJAX framework command. */ Drupal.ajax.prototype.commands.bookingEmailIDs = function(ajax, response, status) { - jQuery(function($) { var arr = $.parseJSON($('input#booking_email_default_ids').val()) $('#booking-manual-email-form').find(':checkbox[name^="table"]').each(function () { //.prop() doesn't exist in Drupal's old version of jQuery so use .attr() instead $(this).attr("checked", ($.inArray($(this).val(), arr) != -1)); - }); - alert(arr[0]); + }); }); } \ No newline at end of file