From a186fe10408a66f8f6c4e5bff5c57e440abfd9f4 Mon Sep 17 00:00:00 2001 From: Rod Roark Date: Wed, 4 Oct 2017 15:28:05 -0700 Subject: [PATCH] Removing unnecessary frameset and related bugs. (#1110) * Removing unnecessary frameset and related bugs. When an encounter is entered the code has been creating a frameset for it with a single frame named "Forms". This seems to be a holdover from when the frameset had a second frame in it. Currently this frameset seems unnecessary since it is contained in another frame or iframe, depending on the layout. In addition there is at least one bug where canceling forms causes the frameset to be nested to arbitrary levels. This commit removes the "Forms" frameset. --- interface/patient_file/encounter/encounter_top.php | 10 +--------- interface/patient_file/encounter/forms.php | 3 +-- library/api.inc | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/interface/patient_file/encounter/encounter_top.php b/interface/patient_file/encounter/encounter_top.php index 248afdaf3..900fdf1aa 100644 --- a/interface/patient_file/encounter/encounter_top.php +++ b/interface/patient_file/encounter/encounter_top.php @@ -21,12 +21,4 @@ if (isset($_GET["set_encounter"])) { setencounter($_GET["set_encounter"]); } -?> - - - - - - - - +include("forms.php"); diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php index 0ed4e1486..05e01f348 100644 --- a/interface/patient_file/encounter/forms.php +++ b/interface/patient_file/encounter/forms.php @@ -1017,8 +1017,7 @@ if ($pass_sens_squad && if (acl_check('admin', 'super')) { if ($formdir != 'newpatient' && $formdir != 'newGroupEncounter') { // a link to delete the form from the encounter - echo "top.restoreSession();parent.window.location='$address';\n"; + echo "\n\n"; exit; } -- 2.11.4.GIT