Index: arms/html/jiraServer/content-container.html =================================================================== diff -u -r3d4ed2f63583496900dfa737bf5979c8f5d7d63b -r7ab62de3ba913c1bc5bd4c83736bc2f6502a0492 --- arms/html/jiraServer/content-container.html (.../content-container.html) (revision 3d4ed2f63583496900dfa737bf5979c8f5d7d63b) +++ arms/html/jiraServer/content-container.html (.../content-container.html) (revision 7ab62de3ba913c1bc5bd4c83736bc2f6502a0492) @@ -372,7 +372,6 @@ class="hidden" id="jira_renew_button_div"> `; - }else if(selectedTab == "이슈우선순위") { + }else if(selectedTab == "issuePriority") { renewHtml += ``; - }else if(selectedTab == "이슈유형") { + }else if(selectedTab == "issueType") { renewHtml += ``; - }else if(selectedTab == "이슈상태") { - renewHtml += ``; } - if(selectedTab == "이슈상태") { + if(selectedTab == "issueStatus") { renewHtml += ``; } $("#jira_renew_button_div_3rd_grid").html(renewHtml); + var 라따적용_클래스이름_배열 = ['.jira_project_type_renew_btn', '.jira_project_status_renew_btn']; + laddaBtnSetting(라따적용_클래스이름_배열); } function tab_click_event() { @@ -768,7 +768,7 @@ $("#jira_server_delete_div").addClass("hidden"); $("#jira_renew_button_div").addClass("hidden"); } else if (target === "#related_project") { - selectedTab = "프로젝트"; + selectedTab = "jiraProject"; set_renew_btn(selectedTab, selectServerId); $("#jira_renew_button_div").removeClass("hidden"); $("#jira_default_update_div").addClass("hidden"); @@ -795,7 +795,7 @@ $("#jira_default_update_div").removeClass("hidden"); $("#jira_server_delete_div").addClass("hidden"); if (target === "#server_issue_resolution") { - selectedTab = "이슈해결책"; + selectedTab = "issueResolution"; $("#server_issue_resolution").removeClass("hidden"); $("#jira_renew_button_div").removeClass("hidden"); @@ -808,7 +808,7 @@ jiraServerDataTable(selectedTab); } if (target ==="#server_issue_priority") { - selectedTab = "이슈우선순위"; + selectedTab = "issuePriority"; $("#server_issue_priority").removeClass("hidden"); set_renew_btn(selectedTab, selectServerId); $("#jira_renew_button_div").removeClass("hidden"); @@ -822,7 +822,7 @@ } if (target === "#issue_type" || target ==="#server_issue_type") { - selectedTab = "이슈유형"; + selectedTab = "issueType"; $("#issue_type_table").removeClass("hidden"); $("#issue_status_table").addClass("hidden"); @@ -845,7 +845,7 @@ } } if (target === "#issue_status" || target ==="#server_issue_status") { - selectedTab = "이슈상태"; + selectedTab = "issueStatus"; $("#issue_type_table").addClass("hidden"); $("#issue_status_table").removeClass("hidden"); @@ -880,7 +880,7 @@ if (serverId === undefined) { serverId = "서버 아이디 정보 없음"; return false; } if (renewJiraType === undefined) { renewJiraType = "갱신할 지라 타입 없음"; return false; } - console.log("갱신버튼을 눌렀습니다. 갱신할 종류(서버아이디) : " + renewJiraType+"("+serverId+")"); //유효한 서버 및 버튼 확인용. + console.log("[ jiraServer :: jira_renew] :: renewJiraType =>" + renewJiraType +" serverId => " + serverId); $.ajax({ url: "/auth-user/api/arms/jiraServer/"+ renewJiraType + "/renewNode.do", @@ -898,8 +898,28 @@ }); } + +function jira_renew_issueType_issueStatus_under_cloud(renewJiraType, jiraProjectId) { + if (jiraProjectId === undefined) { jiraProjectId = "지라프로젝트 아이디 정보 없음"; return false; } + if (renewJiraType === undefined) { renewJiraType = "갱신할 지라 타입 없음"; return false; } + console.log("[ jiraServer :: jira_renew_issueType_issueStatus_under_cloud] :: renewJiraType =>" + renewJiraType +" jiraProjectId => " + jiraProjectId); + + $.ajax({ + url: "/auth-user/api/arms/jiraProject/"+ renewJiraType + "/renewNode.do", + type: "put", + data: { c_id: jiraProjectId, serverId: selectServerId}, + statusCode: { + 200: function () { + jSuccess(renewJiraType + " 데이터가 갱신되었습니다."); + //데이터 테이블 데이터 재 로드 + //makeJiraServerCardDeck(); + //jiraServerCardClick(serverId); + } + } + }); +} + function projectIssueStatusDataTable() { - console.log("issueStatus DataTable"); var columnList= [ { title:"설정", data: "c_id", @@ -945,7 +965,7 @@ var selectList = {}; var orderList = [[1, "asc"]]; var buttonList = []; - console.log("issue_status selectProjectId => " + selectProjectId); + console.log("[ jiraServer :: projectIssueStatusDataTable ] selectProjectId => " + selectProjectId); var jquerySelector = "#issue_status_table"; var ajaxUrl = "/auth-user/api/arms/jiraProject/getProjectIssueStatus.do?c_id="+selectProjectId; var jsonRoot = "response"; @@ -970,7 +990,6 @@ } function projectIssueTypeDataTable() { - console.log("projectIssueType DataTable"); var columnList= [ { title:"설정", @@ -1018,8 +1037,8 @@ var selectList = {}; var orderList = [[1, "asc"]]; var buttonList = []; - - var jquerySelector = "#issue_type_table"; // + console.log("[ jiraServer :: projectIssueTypeDataTable ] selectProjectId => " + selectProjectId); + var jquerySelector = "#issue_type_table"; var ajaxUrl = "/auth-user/api/arms/jiraProject/getProjectIssueType.do?c_id=" + selectProjectId; // 사용 예정 var jsonRoot = "response"; var isServerSide = false; @@ -1045,7 +1064,7 @@ } function jiraServerDataTable(target) { - console.log("jiraServerDataTable target => " + selectedTab); + console.log("[ jiraServer :: jiraServerDataTable] target = " +target); var columnList; var targetAjaxUrl =""; var targetSelector =""; var columnList_type= [ @@ -1218,22 +1237,22 @@ } ]; - if(target === "이슈유형") { + if(target === "issueType") { columnList = columnList_type; targetAjaxUrl = "getJiraIssueType.do?c_id=" + selectServerId; targetSelector = "#server_issue_type_table"; } - if(target === "이슈상태") { + if(target === "issueStatus") { columnList = columnList_status; targetAjaxUrl = "getJiraIssueStatus.do?c_id=" + selectServerId; targetSelector = "#server_issue_status_table"; } - if(target === "이슈우선순위") { + if(target === "issuePriority") { columnList = columnList_priority; targetAjaxUrl = "getJiraIssuePriority.do?c_id=" + selectServerId; targetSelector = "#server_issue_priority_table"; } - if(target === "이슈해결책") { + if(target === "issueResolution") { columnList = columnList_Resolution; targetAjaxUrl = "getJiraIssueResolution.do?c_id=" + selectServerId; targetSelector = "#server_issue_resolution_table"; @@ -1244,7 +1263,6 @@ var selectList = {}; var orderList = [[1, "asc"]]; var buttonList = []; - //console.log("issue_type selectProjectId => " + selectProjectId); var jquerySelector = targetSelector; // var ajaxUrl = "/auth-user/api/arms/jiraServer/" + targetAjaxUrl; var jsonRoot = "response"; @@ -1276,29 +1294,29 @@ var ajax_url =""; var sourceCid = ""; $("button[name='default_update']").click( function (){ - console.log("selectServerType in default_setting_event ===> " + selectServerType); + console.log("[ jiraServer :: default_setting_event ] button[name='default_update'].click :: selectedServerType -> " + selectServerType); if( isEmpty(selectRadioId) ){ jError("설정된 값이 없거나, 변경된 데이터가 없습니다."); return; } - if (selectedTab === "이슈유형" && selectServerType === "클라우드") { + if (selectedTab === "issueType" && selectServerType === "클라우드") { sourceCid = selectProjectId; - ajax_url = "jiraProject/"+ selectedTab+"/makeDefault.do/"+selectRadioId; + ajax_url = "jiraProject/"+ selectedTab+"/makeDefault.do"; } - else if (selectedTab === "이슈상태" && selectServerType === "클라우드") { + else if (selectedTab === "issueStatus" && selectServerType === "클라우드") { sourceCid = selectProjectId; - ajax_url = "jiraProject/"+ selectedTab+"/makeDefault.do/"+selectRadioId; + ajax_url = "jiraProject/"+ selectedTab+"/makeDefault.do"; } else { // 온프레미스 4가지, 클라우드의 해결책,우선순위 sourceCid = selectServerId; - ajax_url = "jiraServer/"+ selectedTab+"/makeDefault.do/"+selectRadioId; + ajax_url = "jiraServer/"+ selectedTab+"/makeDefault.do"; } $.ajax({ url: "/auth-user/api/arms/" + ajax_url, type: "PUT", - data: { c_id: sourceCid }, // 지라프로젝트 또는 서버의 아이디 + data: { c_id: sourceCid, targetCid: selectRadioId }, // 지라프로젝트 또는 서버의 아이디 statusCode: { 200: function (data) { console.log(data); @@ -1315,7 +1333,7 @@ //지라 프로젝트 - 데이터테이블 프로젝트 명 클릭시 function click_projectList_table(projectName) { - console.log("click_projectList_table :: projectName ==============> " + projectName); + console.log("[ jiraServer :: click_projectList_table ] :: projectName => " + projectName); $(".grid3rd").html(""); // Sender 설정 var selectedHtml = @@ -1332,7 +1350,7 @@ //풀사이즈 그리드이면 줄이고, 호스트 정보를 보여준다 console.log($("#serverInfo_Wrapper")[0].className); - console.log("issue_type selectProjectId => " + selectProjectId); + console.log("[ jiraServer :: click_projectList_table ] :: selectProjectId => " + selectProjectId); if ($("#serverInfo_Wrapper").hasClass("col-lg-7")) { //서버 정보 줄이기 $("#serverInfo_Wrapper").removeClass("col-lg-7").addClass("col-lg-4"); @@ -1352,14 +1370,14 @@ } setTimeout(function () { - if(selectedTab === "이슈상태") { + if(selectedTab === "issueStatus") { $("#jira_renew_button_div_3rd_grid").removeClass("hidden"); - set_renew_btn_3rd_grid(selectedTab, selectServerId); - projectIssueStatusDataTable() + set_renew_btn_3rd_grid(selectedTab, selectProjectId); + projectIssueStatusDataTable(); } else { - selectedTab = "이슈유형" + selectedTab = "issueType"; $("#jira_renew_button_div_3rd_grid").removeClass("hidden"); - set_renew_btn_3rd_grid(selectedTab, selectServerId); + set_renew_btn_3rd_grid(selectedTab, selectProjectId); projectIssueTypeDataTable(); } }, 313); @@ -1442,7 +1460,7 @@ } ////////////////////////////////////////////////////////////////////// -// 서버가 가진 이슈유형 "arms-requirement" 확인해서 리본 그리기 +// 서버가 이슈를 생성할 수 있는지 확인하고 리본 그리기 (문제 있음 - 빨강) ////////////////////////////////////////////////////////////////////// function drawRibbon(jiraServerId, jiraServerType, index) { var resultList = [];