djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Rinjae
2026-07-29 19:24:38 +09:00
parent 2422c7f01e 29025d5f47
commit e59f64653f
13 changed files with 141 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/jsp/common/acl/audit/auditLogMan.jsp
+2 -1
View File
@@ -184,8 +184,9 @@ function getEndTime(){
</td>
<th style="width:180px;"><%= localeMessage.getString("auditLogMan.remoteAddress") %></th>
<td><input type="text" name="searchRemoteAddress" value="${param.searchRemoteAddress}" style="width:100%"></td>
<th style="width:180px;"></th>
<th style="width:180px;"><%= localeMessage.getString("auditLogMan.parameters") %></th>
<td>
<input type="text" name="searchParameters" value="${param.searchParameters}" style="width:100%">
</td>
</tr>
</tbody>
WebContent/jsp/common/acl/user/userMan.jsp
+13 -1
View File
@@ -18,7 +18,17 @@
<script language="javascript" >
var url = '<c:url value="/common/acl/user/userMan.json" />';
var url_view = '<c:url value="/common/acl/user/userMan.view" />';
$(document).ready(function() {
function userStatusFormat (cellvalue){
if ( cellvalue == '1' ){
return '<%= localeMessage.getString("code.normal") %>';
}else if ( cellvalue == '2' ) {
return '<span style="color:red"><%= localeMessage.getString("code.lock") %></span>';
}
return '';
}
$(document).ready(function() {
var gridPostData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로
$('#grid').jqGrid({
datatype:"json",
@@ -28,6 +38,7 @@ $(document).ready(function() {
colNames:['<%= localeMessage.getString("login.userId") %>',
'<%= localeMessage.getString("user.name") %>',
'<%= localeMessage.getString("user.roleName") %>',
'<%= localeMessage.getString("user.status") %>',
'<%= localeMessage.getString("user.createOn") %>',
'<%= localeMessage.getString("user.depart") %>',
'<%= localeMessage.getString("user.teamName") %>',
@@ -37,6 +48,7 @@ $(document).ready(function() {
{ name : 'USERID' , align:'center' ,sortable:false },
{ name : 'USERNAME' , align:'center' },
{ name : 'ROLEIDNFINAME' , align:'center' },
{ name : 'STATUS' , align:'center', formatter: userStatusFormat },
{ name : 'LASTAMNDYMS' , align:'center', formatter: timeStampFormat },
{ name : 'DVSNNAME' , align:'center', hidden: true },
{ name : 'TEAMNAME' , align:'center', hidden: true },
WebContent/jsp/common/acl/user/userManDetail.jsp
+3 -3
View File
@@ -216,6 +216,7 @@ $(document).ready(function() {
dataType:"json",
data:{cmd: 'UPDATE_PASSWORD', userId : $("input[name=userId]").val()},
success:function(json){
$('select[name="status"]').val("1")
alert(json.result);
},
error:function(e){
@@ -277,10 +278,10 @@ $(document).ready(function() {
<table class="table_row" cellspacing="0">
<input type="hidden" name="jobclcd">
<tr>
<th style="width:180px;"><%= localeMessage.getString("login.userId") %></th><td ><input type="text" name="userId"/> </td>
<th style="width:180px;"><%= localeMessage.getString("login.userId") %> <span class=\"required-mark\">*</span></th><td ><input type="text" name="userId"/> </td>
</tr>
<tr>
<th><%= localeMessage.getString("user.name") %> </th><td><input type="text" name="userName" /></td>
<th><%= localeMessage.getString("user.name") %> <span class=\"required-mark\">*</span></th><td><input type="text" name="userName" /></td>
</tr>
<tr class="datailT">
<th><%= localeMessage.getString("user.auth") %> </th><td><input type="text" name="roleidnfiname" /></td>
@@ -317,7 +318,6 @@ $(document).ready(function() {
<td>
<div class="select-style">
<select name="status">
<option value=""><%= localeMessage.getString("code.normal") %></option>
<option value="1"><%= localeMessage.getString("code.normal") %></option>
<option value="2"><%= localeMessage.getString("code.lock") %></option>
</select>