From 7b40927d6a4f335612a91cfc74e3ee936deaa0a4 Mon Sep 17 00:00:00 2001 From: shachar058 Date: Thu, 15 Dec 2016 03:25:02 +0200 Subject: [PATCH] major bug fix for recurrent event deletion when no provider chosen (#384) --- interface/main/calendar/add_edit_event.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/interface/main/calendar/add_edit_event.php b/interface/main/calendar/add_edit_event.php index 4d92062d4..d4fffc7e5 100644 --- a/interface/main/calendar/add_edit_event.php +++ b/interface/main/calendar/add_edit_event.php @@ -672,7 +672,7 @@ if ($_POST['form_action'] == "save") { // update the provider's original event // get the original event's repeat specs $origEvent = sqlQuery("SELECT pc_recurrspec FROM openemr_postcalendar_events ". - " WHERE pc_aid = ? AND pc_multiple=?", array($provider,$row['pc_multiple']) ); + " WHERE pc_aid <=> ? AND pc_multiple=?", array($provider,$row['pc_multiple']) ); $oldRecurrspec = unserialize($origEvent['pc_recurrspec']); $selected_date = date("Ymd", strtotime($_POST['selected_date'])); if ($oldRecurrspec['exdate'] != "") { $oldRecurrspec['exdate'] .= ",".$selected_date; } @@ -1800,6 +1800,16 @@ function validateform(valu){ } ?> + + //If multiple providers is enabled, create provider validation (Note: if no provider is chosen it causes bugs when deleting recurrent events). + collectvalidation.form_provider = {presence: true}; + + + var submit = submitme(1, undefined, 'theform', collectvalidation); if(!submit)return; -- 2.11.4.GIT