@@ -101,8 +101,8 @@ var codeControl = new CodeControl();
function searchGroups() {
codeControl.groups.query = {
- by:$("#by").val(),
- term:$("#term").val()
+ by:$("#${infoPrefix}-query [name='by']").val(),
+ term:$("#${infoPrefix}-query [name='term']").val()
};
codeControl.groups.load(1);
}
@@ -218,7 +218,7 @@ codeControl.onCodeSelect = selected => {
$("#btnRemoveCodes").prop("disabled", selected.length < 1);
};
-$("#term").onEnterPress(searchGroups);
+$("#${infoPrefix}term").onEnterPress(searchGroups);
$(function(){
${onload}
diff --git a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp
index 3eedfa1..15e5ae7 100644
--- a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp
@@ -8,7 +8,7 @@
@@ -88,15 +88,15 @@ var ${infoPrefix}Control = new DatasetControl({
});
function search${infoPrefix}s() {
- let logType = $("#logType").val(),
+ let logType = $("#${infoPrefix}logType").val(),
params = {
logTypes: logType ? [logType] : [],
- fromDate: $("#fromDate").val().replace(/-/gi, ""),
- toDate: $("#toDate").val().replace(/-/gi, "")
+ fromDate: $("#${infoPrefix}fromDate").val().replace(/-/gi, ""),
+ toDate: $("#${infoPrefix}toDate").val().replace(/-/gi, "")
},
- terms = $("#${infoPrefix}-query #term").val();
+ terms = $("#${infoPrefix}-query [name='term']").val();
if (terms) {
- switch ($("#${infoPrefix}-query #by").val()) {
+ switch ($("#${infoPrefix}-query [name='by']").val()) {
case "userName": params.userName = terms; break;
case "userAccount": params.userAccounts = [terms]; break;
case "userID": params.userIDs = [terms]; break;
@@ -139,7 +139,7 @@ ${infoPrefix}Control.onCurrentChange = item => {
$("#${infoPrefix}List").setCurrentRow(key);
};
-$("#term").onEnterPress(search${infoPrefix}s);
+$("#${infoPrefix}term").onEnterPress(search${infoPrefix}s);
$(function(){
${onload}
@@ -149,7 +149,7 @@ $(function(){
${infoPrefix}Fetch:${syslogFetch},
${infoPrefix}Total:${syslogTotal}
});
- $("#${infoPrefix}-query #fromDate, #${infoPrefix}-query #toDate").datePicker();
+ $("#${infoPrefix}-query #${infoPrefix}fromDate, #${infoPrefix}-query #${infoPrefix}toDate").datePicker();
});
//# sourceURL=${infoPrefix}-main.jsp
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp b/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp
index ee1f233..7de26ff 100644
--- a/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp
@@ -10,12 +10,12 @@
${prefixName}