Index: arms/js/pdServiceJira.js =================================================================== diff -u -re295ddfe571fb6a3ec09142065ef65ff4c295eb1 -rb487fb61f64d3d3e0a59607da35755dddd78bcb0 --- arms/js/pdServiceJira.js (.../pdServiceJira.js) (revision e295ddfe571fb6a3ec09142065ef65ff4c295eb1) +++ arms/js/pdServiceJira.js (.../pdServiceJira.js) (revision b487fb61f64d3d3e0a59607da35755dddd78bcb0) @@ -138,7 +138,7 @@ data-toggle="collapse" name="versionLink_List" style="color: #a4c6ff; text-decoration: none; cursor: pointer;" - onclick="versionClick(this, ${menu[i].c_id}, '${menu[i].c_title}');"> + onclick="versionClick(this, ${menu[i].c_id});"> ${menu[i].c_title} @@ -149,20 +149,20 @@ } //버전 클릭할 때 동작하는 함수 -function versionClick(element, c_id, c_title) { +function versionClick(element, c_id) { - if( isEmpty(element)){ + $("a[name='versionLink_List']").each(function() { + this.style.background = ""; + }); + + if( element == null ){ console.log("element is empty"); }else{ - $("a[name='versionLink_List']").each(function() { - this.style.background = ""; - }); element.style.background = "rgba(229, 96, 59, 0.20)"; console.log("element is = " + element); } selectVersion = c_id; - selectVersionName= c_title; console.log("selectVersion" + selectVersion); $(".searchable").multiSelect('deselect_all'); @@ -214,7 +214,7 @@ // 제품(서비스)-버전-지라 저장 $("#pdServiceConnect").click(function () { - if($("#pdServiceConnect").hasClass("btn-primary") === true) { + if($("#pdServiceConnect").hasClass("btn-primary") == true) { // data가 존재하지 않음. $.ajax({ @@ -230,13 +230,13 @@ }, progress: true }).done(function(data) { - versionClick(null, selectVersion, ''); + versionClick(null, selectVersion); }).fail(function(e) { console.log("fail call"); }).always(function() { console.log("always call"); }); - } else if($("#pdServiceConnect").hasClass("btn-success") === true) { + } else if($("#pdServiceConnect").hasClass("btn-success") == true) { // data가 이미 있음 $.ajax({ url: "/auth-user/api/arms/pdServiceConnect/updateNode.do", @@ -251,7 +251,7 @@ }, progress: true }).done(function(data) { - versionClick(selectVersion); + versionClick(null, selectVersion); }).fail(function(e) { console.log("fail call"); }).always(function() { Index: arms/js/pdServiceVersion.js =================================================================== diff -u -re295ddfe571fb6a3ec09142065ef65ff4c295eb1 -rb487fb61f64d3d3e0a59607da35755dddd78bcb0 --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision e295ddfe571fb6a3ec09142065ef65ff4c295eb1) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision b487fb61f64d3d3e0a59607da35755dddd78bcb0) @@ -349,19 +349,35 @@ `; for (var i = 0; i < menu.length; i++) { - data += ` + if ( i == 0 ){ + data += `
+
+
`; + }else{ + data += ` +
+
+
`; + } } main.html(data); @@ -393,8 +409,7 @@ $("#pdServiceName").text($('#pdserviceTable').DataTable().rows('.selected').data()[0].c_title); - - $("#pdServiceVersion").text(json.c_title); + $("#pdServiceVersion").val(json.c_title); $("#versionStartDate").val(json.c_start_date); $("#versionEndDate").val(json.c_end_date); $("#versionContents").html(json.c_contents);