diff --git a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp index 44526624..aa731bf2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp @@ -16,12 +16,12 @@
기능 그룹
-
- - +
@@ -105,8 +105,8 @@ var action${infoPrefix}Control = new ActionGroupControl(); function searchaction${infoPrefix}s() { action${infoPrefix}Control.groups.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; action${infoPrefix}Control.groups.query.fetchAll = true; action${infoPrefix}Control.groups.load(1); @@ -214,7 +214,7 @@ action${infoPrefix}Control.onActionSelect = selected => { $("#btnRemoveActions").prop("disabled", keys.length < 1); }; -$("#term").onEnterPress(searchaction${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(searchaction${infoPrefix}s); $(function(){ ${onload} diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp index 18ae3e99..50c4b922 100644 --- a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp @@ -17,12 +17,12 @@
권한
-
- - +
@@ -87,11 +87,25 @@ \ 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 ee1f2339..7de26ffc 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}
<%--div> -
- - +
@@ -102,8 +102,8 @@ sggDeptControl.sggs.query = {includeAll: true}; <%-- function searchSggs() { sggDeptControl.sggs.query = { - by:$("#by").val(), - term:$("#term").val(), + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() includeAll: true }; sggDeptControl.sggs.load(1); @@ -240,7 +240,7 @@ $(function(){ deptTotal:${deptTotal} }); -<%-- $("#term").onEnterPress(searchSggs); --%> +<%-- $("#${infoPrefix}term").onEnterPress(searchSggs); --%> }); //# sourceURL=sgg-dept.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp index 4cf9e733..f6545977 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp @@ -7,18 +7,18 @@
-
- - +
- +
@@ -68,8 +68,8 @@ var ${infoPrefix}Control = new UserControl(); function search${infoPrefix}s() { ${infoPrefix}Control.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; ${infoPrefix}Control.load(1); } @@ -135,10 +135,10 @@ ${infoPrefix}Control.onSelectionChange = selected => { checkbox.prop("checked", keys.includes(checkbox.val())); }); - $("button.on-select").prop("disabled", keys.length < 1); + $("#btnRemove${infoPrefix}s").prop("disabled", keys.length < 1); }; -$("#term").onEnterPress(search${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(search${infoPrefix}s); $(function(){ ${onload}