Merge remote-tracking branch 'origin/master'

2026-09-01 18:26:47 +09:00
parent 60d1dcea96 bb3fb5e111
commit 1ac84f2f92
40 changed files with 956 additions and 316 deletions
@@ -89,7 +89,7 @@
                mtype: 'POST', 
                url: url,
                postData: getSearchForJqgrid("cmd", "LIST"),
-                colNames: ['id', 'No.', '기관명', '이벤트유형', 'Target URL', 'Proxy URL', 'Status', '성공여부', '발송서버', '발송일시'],
+                colNames: ['id', 'No.', '기관명', '이벤트유형', 'Target URL', 'Proxy URL', 'Status', '성공여부', '재시도', '발송서버', '발송일시'],
                colModel: [
                    {name: 'id', align: 'center', key: true, hidden: true},
                    {name: 'rowNum', align: 'center', width: 45, sortable: false},
@@ -99,11 +99,12 @@
                    {name: 'proxyUrl', align: 'left', width: 300, formatter: formatTargetUrl},
                    {name: 'statusCode', align: 'center', width: 60},
                    {name: 'success', align: 'center', width: 70, formatter: formatSuccess},
+                    {name: 'retryCount', align: 'center', width: 60},
                    {name: 'sendBy', align: 'center', width: 100},
                    {name: 'sentAt', align: 'center', width: 140}
                ],
                jsonReader: {repeatitems: false},	
-                pager: $('#pager'),
+                pager: $('#pager'),		
                page: '${param.page}',
                rowNum: '${rmsDefaultRowNum}',
                autoheight: true,