Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Datepicker formatting correction
Allow format datbase type to be selected and saved
  • Loading branch information
root authored and root committed Oct 19, 2018
1 parent 4b3413c commit 7181c28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions projects/admin/configureproject.xml.php
Expand Up @@ -236,16 +236,17 @@

if ( !preg_match("/ReporticoApp/", $txt)) {
ReporticoApp::handleError ("Warning - This project was created with an older version of reportico. The configuration file has been replaced with a new version compatible with $this->version. Your original config file was backed up in the project folder to config.php.orig.", E_USER_WARNING);
$proj_menu = $proj_dir."/menu.php";
$proj_menu = $proj_dir."/menu.php";
$retval = file_put_contents($proj_conf.".orig", $txt);

// We dont need a menu.php file in the new version
if ( file_exists($proj_menu) )
rename($proj_menu, $proj_menu.".orig");
}
// If the config file does not have a SW_DB_TYPE entry then we are running a pre-2.8
// If the config file does not have use ReporticoApp for storing config
// or SW_DB_TYPE entry then we are running a pre-2.8
// report with a post 2.8 reportico ... so generate a new one from the admin template
else if ( preg_match ( "/SW_DB_TYPE/", $txt ))
else if ( preg_match("/ReporticoApp/", $txt ) || preg_match ( "/SW_DB_TYPE/", $txt ))
{
$conffound = true;
}
Expand Down
1 change: 1 addition & 0 deletions themes/default/templates/prepare.tpl
Expand Up @@ -3,6 +3,7 @@

<div id="reportico-container">

<script type="text/javascript">var reportico_datepicker_language = "{{ AJAX_DATEPICKER_FORMAT }}";</script>
<script>
reportico_criteria_items = [];
{% if CRITERIA_ITEMS is defined %}
Expand Down

0 comments on commit 7181c28

Please sign in to comment.