diff --git a/WebContent/js/common-en.js b/WebContent/js/common-en.js index 0487b36..6a983ab 100644 --- a/WebContent/js/common-en.js +++ b/WebContent/js/common-en.js @@ -37,16 +37,14 @@ function isChromeBrowse() { } // find Context -function getContextName() -{ - // get context - var loc = location.href; - var sPos = loc.indexOf("/", 7) - var ePos = loc.indexOf("/", sPos+1) +function getContextName() { + // get context path from pathname (works with both http and https) + var pathname = location.pathname; + var pos = pathname.indexOf("/", 1); - if (ePos == -1) return "/"; - else return loc.substr(sPos, ePos-sPos + 1); -} + if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/"; + else return pathname.substring(0, pos + 1); +} // return today : 20081231 function getToday() { diff --git a/WebContent/js/common-ko.js b/WebContent/js/common-ko.js index 8474645..59f170d 100644 --- a/WebContent/js/common-ko.js +++ b/WebContent/js/common-ko.js @@ -37,13 +37,12 @@ function isChromeBrowse() { // find Context function getContextName() { - // get context - var loc = location.href; - var sPos = loc.indexOf("/", 7) - var ePos = loc.indexOf("/", sPos + 1) + // get context path from pathname (works with both http and https) + var pathname = location.pathname; + var pos = pathname.indexOf("/", 1); - if (ePos == -1) return "/"; - else return loc.substr(sPos, ePos - sPos + 1); + if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/"; + else return pathname.substring(0, pos + 1); } // return today : 20081231 diff --git a/WebContent/js/custom.js b/WebContent/js/custom.js index c71c8b0..e6bb511 100644 --- a/WebContent/js/custom.js +++ b/WebContent/js/custom.js @@ -149,7 +149,7 @@ jQuery.showModalDialog = function(options) { $().showModalDialog(options); }; var originalError = options.error; options.error = function(xhr, status, error) { if(xhr.status === 401) { - var location = getContextName() + '/'; + var location = getContextName(); comloadError(xhr, status, error, location); return; } diff --git a/WebContent/jsp/js/common-en.js b/WebContent/jsp/js/common-en.js index d5c846f..11a67eb 100644 --- a/WebContent/jsp/js/common-en.js +++ b/WebContent/jsp/js/common-en.js @@ -37,16 +37,14 @@ function isChromeBrowse() { } // find Context -function getContextName() -{ - // get context - var loc = location.href; - var sPos = loc.indexOf("/", 7) - var ePos = loc.indexOf("/", sPos+1) +function getContextName() { + // get context path from pathname (works with both http and https) + var pathname = location.pathname; + var pos = pathname.indexOf("/", 1); - if (ePos == -1) return "/"; - else return loc.substr(sPos, ePos-sPos + 1); -} + if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/"; + else return pathname.substring(0, pos + 1); +} // return today : 20081231 function getToday() { diff --git a/WebContent/jsp/js/common-ko.js b/WebContent/jsp/js/common-ko.js index 1a2af10..ffdff43 100644 --- a/WebContent/jsp/js/common-ko.js +++ b/WebContent/jsp/js/common-ko.js @@ -37,15 +37,13 @@ function isChromeBrowse() { } // find Context -function getContextName() -{ - // get context - var loc = location.href; - var sPos = loc.indexOf("/", 7) - var ePos = loc.indexOf("/", sPos+1) +function getContextName() { + // get context path from pathname (works with both http and https) + var pathname = location.pathname; + var pos = pathname.indexOf("/", 1); - if (ePos == -1) return "/"; - else return loc.substr(sPos, ePos-sPos + 1); + if (pos == -1) return pathname.endsWith("/") ? pathname : pathname + "/"; + else return pathname.substring(0, pos + 1); } // return today : 20081231 function getToday() diff --git a/WebContent/jsp/onl/admin/common/propertyManDetail.jsp b/WebContent/jsp/onl/admin/common/propertyManDetail.jsp index 8dff400..582d220 100644 --- a/WebContent/jsp/onl/admin/common/propertyManDetail.jsp +++ b/WebContent/jsp/onl/admin/common/propertyManDetail.jsp @@ -193,6 +193,10 @@ var url_view = ''; }); }); $("#btn_delete").click(function() { + if(!confirm("삭제하시겠습니까?")){ + return; + } + var postData = $('#ajaxForm').serializeArray(); postData.push({ name : "cmd", diff --git a/WebContent/jsp/onl/admin/rule/layoutMan.jsp b/WebContent/jsp/onl/admin/rule/layoutMan.jsp index 49cd45c..28eaa9e 100644 --- a/WebContent/jsp/onl/admin/rule/layoutMan.jsp +++ b/WebContent/jsp/onl/admin/rule/layoutMan.jsp @@ -313,6 +313,10 @@ $('#btn_import').click(onclickExcelImport); $("#btn_delete").click(function () { + if(!confirm("삭제하시겠습니까?")){ + return; + } + var id = "grid"; var delArr = new Array(); var ids = $("#grid").jqGrid('getDataIDs'); diff --git a/WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp b/WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp index 17b8eee..b0243a0 100644 --- a/WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp +++ b/WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp @@ -238,6 +238,10 @@ $(document).ready(function() { $('#btn_clone').click(onclickBtnClone); $("#btn_delete").click(function(){ + if(!confirm("삭제하시겠습니까?")){ + return; + } + var id = "grid"; var cnvsnNameArr = new Array(); var eaiSvcNameArr = new Array(); diff --git a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp index 9fe72bc..ed96fd4 100644 --- a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp +++ b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp @@ -703,7 +703,15 @@ transformRows = json.transformRows; //eaiSvcName combo $("input[name=eaiSvcName]").val('${param.eaiSvcName }'); - $("input[name=eaiSvcDesc]").val('${param.eaiSvcDesc }'); + + var rawDesc = '${param.eaiSvcDesc}'; + + if (rawDesc && rawDesc !== "") { + $("input[name=eaiSvcDesc]").val(decodeURIComponent(rawDesc)); + } else { + $("input[name=eaiSvcDesc]").val(""); + } + //$("input[name=cnvsnDesc]").val('${param.cnvsnDesc }'); new makeOptions("CODE","NAME").setObj($("#functionCombo")).setData(json.functionRows).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("transformManDetail.none")%>").setFormat(codeName3OptionFormat).rendering(); @@ -1065,6 +1073,10 @@ }); $("#btn_delete").click(function(){ + if(!confirm("삭제하시겠습니까?")){ + return; + } + var postData = []; const cnvsnName = $("select[name=transformForEaiSvcNameCombo]").val(); const cnvsnType = cnvsnName.slice(-3); diff --git a/WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp b/WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp index ea6d7be..04e240f 100644 --- a/WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp +++ b/WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp @@ -154,6 +154,10 @@ $(document).ready(function() { }); }); $("#btn_delete").click(function(){ + if(!confirm("삭제하시겠습니까?")){ + return; + } + var disabled = $('#ajaxForm').find(':input:disabled').removeAttr('disabled'); var postData = $('#ajaxForm').serializeArray(); disabled.attr('disabled','disabled'); diff --git a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp index 6b53621..7ea49da 100644 --- a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp +++ b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp @@ -62,12 +62,22 @@ position: relative; } - /* 어댑터, 메서드 라이브 서치 사용시 width 깨짐 방지 */ + /* 어댑터, 메서드 select2 사용시 width 깨짐 방지 */ .select2-container { width: 100% !important; box-sizing: border-box; } + /* 버튼 내용이 길어질 경우 말줄임표(...) 처리 */ + .btn-ellipsis { + max-width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + vertical-align: middle; + } +