diff --git a/src/include/functions_config.php b/src/include/functions_config.php index 467f712..e40a2f8 100644 --- a/src/include/functions_config.php +++ b/src/include/functions_config.php @@ -358,7 +358,7 @@ function InitReportModules() { // --- Create SQL Query $sqlquery = " SELECT " . - DB_SAVEDREPORTS . ".ID, " . + DB_SAVEDREPORTS . ".ID as SavedReportID, " . DB_SAVEDREPORTS . ".sourceid, " . DB_SAVEDREPORTS . ".customTitle, " . DB_SAVEDREPORTS . ".customComment, " . @@ -376,13 +376,16 @@ function InitReportModules() $myrows = DB_GetAllRows($result, true); if ( isset($myrows) && count($myrows) > 0 ) { + // Set to true! + $content['REPORTS'][$myReportID]['HASSAVEDREPORTS'] = true; + // Add all savedreports foreach ($myrows as &$mySavedReport) { // TODO: Perform whatever needs to be performed // Add saved report into global array - $content['REPORTS'][$myReportID]['SAVEDREPORTS'][ $mySavedReport['ID'] ] = $mySavedReport; + $content['REPORTS'][$myReportID]['SAVEDREPORTS'][ $mySavedReport['SavedReportID'] ] = $mySavedReport; } } diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php index 73b41e9..de95008 100644 --- a/src/lang/de/admin.php +++ b/src/lang/de/admin.php @@ -392,6 +392,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1' $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; +$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport"; $content['LN_REPORTS_'] = ""; ?> \ No newline at end of file diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php index 39744dd..ca2f60b 100644 --- a/src/lang/en/admin.php +++ b/src/lang/en/admin.php @@ -405,6 +405,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1' $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; +$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport"; $content['LN_REPORTS_'] = ""; diff --git a/src/lang/it_IT/admin.php b/src/lang/it_IT/admin.php index 3d7198a..4b1ad17 100644 --- a/src/lang/it_IT/admin.php +++ b/src/lang/it_IT/admin.php @@ -405,6 +405,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1' $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; +$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport"; $content['LN_REPORTS_'] = ""; ?> \ No newline at end of file diff --git a/src/lang/pt_BR/admin.php b/src/lang/pt_BR/admin.php index 73b41e9..de95008 100644 --- a/src/lang/pt_BR/admin.php +++ b/src/lang/pt_BR/admin.php @@ -392,6 +392,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1' $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; +$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport"; $content['LN_REPORTS_'] = ""; ?> \ No newline at end of file diff --git a/src/templates/admin/admin_reports.html b/src/templates/admin/admin_reports.html index 15a1059..279abbf 100644 --- a/src/templates/admin/admin_reports.html +++ b/src/templates/admin/admin_reports.html @@ -35,6 +35,8 @@ {DisplayName} {Description} +   +    @@ -49,6 +51,20 @@ + + + {LN_REPORTS_SAVEDREPORTS} + + + + + {customTitle} + + + + + +