calendar facilities list bug (openemr#4161)

* calendar facilities list bug - list not responsive if more than six facilities - modify dump command option escaping * - fix lists on windows
DiscoverAndChange · Jan 5, 2021 · a00d6f8 · a00d6f8
1 parent 386eeb7
commit a00d6f8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/interface/main/backup.php b/interface/main/backup.php
@@ -461,14 +461,17 @@ function gzopen($filename, $mode, $use_include_path = 0)
  $cmd .= "echo 'DELETE FROM list_options WHERE list_id = \"" . add_escape_custom($listid) . "\";' >> " . escapeshellarg($EXPORT_FILE) . ";";
  $cmd .= "echo 'DELETE FROM list_options WHERE list_id = \"lists\" AND option_id = \"" . add_escape_custom($listid) . "\";' >> " . escapeshellarg($EXPORT_FILE) . ";";
  }
- $cmd .= $dumppfx .
- " --where='list_id = \"lists\" AND option_id = \"" . add_escape_custom($listid) . "\" OR list_id = \"" . add_escape_custom($listid) . "\" " .
- "ORDER BY list_id != \"lists\", seq, title' " .
- escapeshellarg($sqlconf["dbase"]) . " list_options";
  if (IS_WINDOWS) {
- # windows uses the & to join statements.
+ # windows uses the & to join statements.
+ $cmd .= $dumppfx . " --where=\"list_id = 'lists' AND option_id = '$listid' OR list_id = '$listid' " .
+ "ORDER BY list_id != 'lists', seq, title\" " .
+ escapeshellarg($sqlconf["dbase"]) . " list_options";
  $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . " & ";
  } else {
+ $cmd .= $dumppfx . " --where='list_id = \"lists\" AND option_id = \"" .
+ add_escape_custom($listid) . "\" OR list_id = \"" .
+ add_escape_custom($listid) . "\" " . "ORDER BY list_id != \"lists\", seq, title' " .
+ escapeshellarg($sqlconf["dbase"]) . " list_options";
  $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . ";";
  }
  }
@@ -501,23 +504,21 @@ function gzopen($filename, $mode, $use_include_path = 0)
  } else {
  $cmd .= "echo 'DELETE FROM layout_group_properties WHERE grp_form_id = \"" . add_escape_custom($layoutid) . "\";' >> " . escapeshellarg($EXPORT_FILE) . ";";
  }
- $cmd .= $dumppfx .
- ' --where="grp_form_id = \'' . add_escape_custom($layoutid) . "'\" " .
- escapeshellarg($sqlconf["dbase"]) . " layout_group_properties";
  if (IS_WINDOWS) {
  # windows uses the & to join statements.
+ $cmd .= $dumppfx . ' --where="grp_form_id = \'' . add_escape_custom($layoutid) . "'\" " .
+ escapeshellarg($sqlconf["dbase"]) . " layout_group_properties";
+ $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . " & ";
+ $cmd .= $dumppfx . ' --where="form_id = \'' . add_escape_custom($layoutid) . '\' ORDER BY group_id, seq, title" ' .
+ escapeshellarg($sqlconf["dbase"]) . " layout_options" ;
  $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . " & ";
  } else {
+ $cmd .= $dumppfx . " --where='grp_form_id = \"" . add_escape_custom($layoutid) . "\"' " .
+ escapeshellarg($sqlconf["dbase"]) . " layout_group_properties";
+ $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . ";";
+ $cmd .= $dumppfx . " --where='form_id = \"" . add_escape_custom($layoutid) . "\" ORDER BY group_id, seq, title' " .
+ escapeshellarg($sqlconf["dbase"]) . " layout_options" ;
  $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . ";";
- }
- $cmd .= $dumppfx .
- ' --where="form_id = \'' . add_escape_custom($layoutid) . '\' ORDER BY group_id, seq, title" ' .
- escapeshellarg($sqlconf["dbase"]) . " layout_options" ;
- if (IS_WINDOWS) {
- # windows uses the & to join statements.
- $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . " & ";
- } else {
- $cmd .= " >> " . escapeshellarg($EXPORT_FILE) . ";";
  }
  }
  }

diff --git a/interface/themes/ajax_calendar_sass.scss b/interface/themes/ajax_calendar_sass.scss
@@ -92,6 +92,7 @@ $side-calendar-date-padding: 0.3rem !default;
  margin-left: auto;
  margin-right: auto;
  margin-top: 0.3rem;
+ max-height: 25vh;
  width: 90%;
 
  table {