diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 2b2d60d4..bfef4bb7 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -47,7 +47,7 @@ $js_head = array( "../include/timepicker/jquery-ui.min.js", //"../include/jquery-ui/jquery-ui.min.js", "../include/timepicker/jquery-ui-timepicker-addon.js", -"../include/timepicker/jquery-ui-timepicker-ru.js", +//"../include/timepicker/jquery-ui-timepicker-ru.js", ); $js_foot = array( "../js/bootstrap-confirmation.js", @@ -103,7 +103,7 @@ if (isset($_GET['start']) && isset($_GET['end']) && isset($_GET['update'])) } -if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(($_GET['new'] == 'new') && isset($_GET['case_id']))) +if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(isset($_GET['new']) && isset($_GET['case_id']))) { $appointment_id = bigintval($_GET['appointment_id']); $case_id = bigintval($_GET['case_id']); diff --git a/include/timepicker/jquery-ui-timepicker-addon.js b/include/timepicker/jquery-ui-timepicker-addon.js index 65e05a00..2249930b 100644 --- a/include/timepicker/jquery-ui-timepicker-addon.js +++ b/include/timepicker/jquery-ui-timepicker-addon.js @@ -28,7 +28,7 @@ */ var Timepicker = function () { this.regional = []; // Available regional settings, indexed by language code - this.regional[''] = { // Default regional settings + this.regional['en'] = { // Default regional settings currentText: 'Now', closeText: 'Done', amNames: ['AM', 'A'], @@ -104,7 +104,7 @@ defaultValue: null, parse: 'strict' }; - $.extend(this._defaults, this.regional['']); + $.extend(this._defaults, this.regional['en']); }; $.extend(Timepicker.prototype, {