3 năm trước cách đây · 7612d3abe0
--- a/server/src/main/resources/password/pwm/i18n/Admin.properties
+++ b/server/src/main/resources/password/pwm/i18n/Admin.properties
@@ -311,7 +311,7 @@ EpsStatistic_Label.DB_WRITES=Database Writes
 
				 Title_About=About
			
 
				 Title_DirectoryReporting=Directory Reporting
			
 
				 Title_DataViewer=Data Viewer
			
 
				-Title_ReportEngineStatus=Report Engine Status
			
 
				+Title_DirectoryReport=Directory Report
			
 
				 Title_EventStatistics=Event Statistics
			
 
				 Title_RawStatistics=Raw Statistics
			
 
				 Title_StatisticsCharts=Event Charts
			
--- a/webapp/src/main/webapp/WEB-INF/jsp/admin-reporting.jsp
+++ b/webapp/src/main/webapp/WEB-INF/jsp/admin-reporting.jsp
@@ -33,12 +33,12 @@
 
				 <%@ include file="/WEB-INF/jsp/fragment/header.jsp" %>
			
 
				 <body class="nihilo">
			
 
				 <div id="wrapper">
			
 
				-    <% final String PageName = JspUtility.localizedString(pageContext,"Title_DataAnalysis",Admin.class);%>
			
 
				+    <% final String PageName = JspUtility.localizedString(pageContext,"Title_DirectoryReport",Admin.class);%>
			
 
				     <jsp:include page="/WEB-INF/jsp/fragment/header-body.jsp">
			
 
				         <jsp:param name="pwm.PageName" value="<%=PageName%>"/>
			
 
				     </jsp:include>
			
 
				     <div id="centerbody">
			
 
				-        <h1 id="page-content-title"><pwm:display key="Title_DataAnalysis" bundle="Admin"/></h1>
			
 
				+        <h1 id="page-content-title"><pwm:display key="Title_DirectoryReport" bundle="Admin"/></h1>
			
 
				         <%@ include file="fragment/admin-modular-nav.jsp" %>
			
 
				         <table id="statusTable">
			
 
				             <tr><td><pwm:display key="Display_PleaseWait"/></td></tr>
			
--- a/webapp/src/main/webapp/public/resources/js/admin.js
+++ b/webapp/src/main/webapp/public/resources/js/admin.js
@@ -109,9 +109,11 @@ PWM_ADMIN.initDownloadProcessReportZipForm = function() {
 
				     PWM_MAIN.doQuery("#reportDownloadButton", function(node){
			
 
				         PWM_MAIN.addEventHandler(node, "click", function() {
			
 
				             PWM_MAIN.showConfirmDialog({title:"Report Status",text:PWM_ADMIN.showString('Confirm_Report_Start'),okAction:function(){
			
 
				-                const url = PWM_MAIN.addParamToUrl(window.location.href,'processAction','downloadReportZip');
			
 
				-                window.location.href = url;
			
 
				-            }});
			
 
				+                    let url = PWM_MAIN.addParamToUrl(window.location.href,'processAction','downloadReportZip');
			
 
				+                    url = PWM_MAIN.addParamToUrl(url,'recordCount',PWM_MAIN.getObject('recordCount').value);
			
 
				+                    url = PWM_MAIN.addParamToUrl(url,'recordType',PWM_MAIN.JSLibrary.readValueOfSelectElement('recordType'));
			
 
				+                    window.location.href = url;
			
 
				+                }});
			
 
				         })
			
 
				     });
			
 
				     PWM_MAIN.doQuery("#reportCancelButton", function(node){