Index: arms/html/pdServiceVersion/content-container.html =================================================================== diff -u -r12c8edcfa9a5be18262870328d0461fcef8de16c -r452cbbf4f00e64a2836ddb67425fdb1151ea9bc5 --- arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 12c8edcfa9a5be18262870328d0461fcef8de16c) +++ arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 452cbbf4f00e64a2836ddb67425fdb1151ea9bc5) @@ -424,7 +424,7 @@ style="padding-bottom: 5px; padding-top: 3px"> 선택된 버전 : 선택되지 않음 @@ -450,6 +450,12 @@ class="btn btn-success btn-sm hidden ladda-update-pdservice-version"> 버전 정보 변경 +
@@ -766,7 +772,13 @@
Index: arms/js/pdServiceVersion.js =================================================================== diff -u -r41bb3994595556d9391e296b43b963cb3e7fd5f4 -r452cbbf4f00e64a2836ddb67425fdb1151ea9bc5 --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 41bb3994595556d9391e296b43b963cb3e7fd5f4) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 452cbbf4f00e64a2836ddb67425fdb1151ea9bc5) @@ -6,6 +6,7 @@ var selectedIndex; // 데이터테이블 선택한 인덱스 var selectedPage; // 데이터테이블 선택한 인덱스 var selectVersion; // 선택한 버전 아이디 +var selectVersionName; // 선택한 버전 이름 var dataTableRef; // 데이터테이블 참조 변수 //////////////////////////////////////////////////////////////////////////////////////// @@ -285,25 +286,32 @@ //////////////////////////////////////////////////////////////////////////////////////// function click_btn_for_delete_version() { $("#del_version").click(function () { - console.log("delete btn"); - $.ajax({ - url: "/auth-user/api/arms/pdService/removeVersion.do", - type: "DELETE", - data: { - pdservice_c_id: selectId, - version_c_id: selectVersion - }, - statusCode: { - 200: function () { - console.log("삭제 성공!"); - //모달 팝업 끝내고 - $("#close_version").trigger("click"); - $("#select_Version").text("선택되지 않음"); - //버전 데이터 재 로드 - dataLoad(selectId, selectName); + if (!selectVersion) { + alert("선택된 버전이 없습니다."); + return false; + } + + if (confirm(selectVersionName + " 버전을 삭제하시겠습니까?")) { + console.log("delete btn"); + $.ajax({ + url: "/auth-user/api/arms/pdService/removeVersion.do", + type: "DELETE", + data: { + pdservice_c_id: selectId, + version_c_id: selectVersion + }, + statusCode: { + 200: function () { + console.log("삭제 성공!"); + //모달 팝업 끝내고 + $("#close_version").trigger("click"); + $("#select_version").text("선택되지 않음"); + //버전 데이터 재 로드 + dataLoad(selectId, selectName); + } } - } - }); + }); + } }); } @@ -510,35 +518,13 @@ $(".list-group-item").html(selectedHtml); $("#select_PdService").text(selectedText); // sender 이름 바인딩 + $("#pdservice_name").val(selectedText); - $("#tooltip_enabled_service_name").val(selectedText); - if( !isEmpty(json.pdServiceVersionEntities) ){ - // 상세보기 - selectVersion = json.pdServiceVersionEntities[0].c_id; - $("#pdservice_name").val(selectedText); - - $("#version_start_date").val(json.pdServiceVersionEntities[0].c_start_date); - $("#version_end_date").val(json.pdServiceVersionEntities[0].c_end_date); - - CKEDITOR.instances.version_contents.setData(json.pdServiceVersionEntities[0].c_contents); - - // 상세보기 편집하기 - $("#input_pdservice_name").val(selectedText); - $("#input_pdservice_version").val(json.pdServiceVersionEntities[0].c_title); - - $("#input_pdservice_start_date").datetimepicker({ value: json.pdServiceVersionEntities[0].c_start_date + " 09:00", step: 10 , theme:'dark'}); - $("#input_pdservice_end_date").datetimepicker({ value: json.pdServiceVersionEntities[0].c_end_date + " 18:00", step: 10 , theme:'dark'}); - CKEDITOR.instances.input_pdservice_editor.setData(json.pdServiceVersionEntities[0].c_contents); - - //편집하기 팝업 - $("#tooltip_enabled_service_name").val(selectedText); - $("#tooltip_enabled_service_version").val(json.pdServiceVersionEntities[0].c_title); - $("#btn_enabled_date").datetimepicker({ value: json.pdServiceVersionEntities[0].c_start_date + " 09:00", step: 10 , theme:'dark'}); - $("#btn_end_date").datetimepicker({ value: json.pdServiceVersionEntities[0].c_end_date + " 18:00", step: 10 , theme:'dark'}); - CKEDITOR.instances.extend_modal_editor.setData(json.pdServiceVersionEntities[0].c_contents); - } + setTimeout(function () { + $("#pdService_Version_First_Child").trigger("click"); + }, 500); }); } @@ -554,7 +540,7 @@ draw($(this), menu); } else if (action == "set") { menu = items; - // $("#select_Version").text(items[0].c_title); // 로드시 첫번째 버전 + // $("#select_version").text(items[0].c_title); // 로드시 첫번째 버전 draw($(this), menu); } return this; @@ -589,6 +575,7 @@