Index: arms/html/reqAdd/content-container.html
===================================================================
diff -u -rc7c33a08a1010cccc85de68482bcf6b34a27cc49 -r39632cec5a85b3450f59c5991cd4e5db4c3a1930
--- arms/html/reqAdd/content-container.html (.../content-container.html) (revision c7c33a08a1010cccc85de68482bcf6b34a27cc49)
+++ arms/html/reqAdd/content-container.html (.../content-container.html) (revision 39632cec5a85b3450f59c5991cd4e5db4c3a1930)
@@ -18,28 +18,14 @@
-
Index: arms/js/pdService.js
===================================================================
diff -u -r166b38d9e489aae66d508388e84dc36657b561ee -r39632cec5a85b3450f59c5991cd4e5db4c3a1930
--- arms/js/pdService.js (.../pdService.js) (revision 166b38d9e489aae66d508388e84dc36657b561ee)
+++ arms/js/pdService.js (.../pdService.js) (revision 39632cec5a85b3450f59c5991cd4e5db4c3a1930)
@@ -201,13 +201,13 @@
}
// --- select2 (사용자 자동완성 검색 ) 선택하고 나면 선택된 데이터 공간을 벌리기위한 설정 --- //
-$('#popup-editView-pdService-reviewer').on('select2:selecting', function (e) {
+$('#popup-editView-pdService-reviewer').on('select2:select', function (e) {
var heightValue = $('#popup-editView-pdService-reviewer').height();
var resultValue = heightValue + 20;
$('#popup-editView-pdService-reviewer').css('height', resultValue + 'px');
});
-$('#editView-pdService-reviewers').on('select2:selecting', function (e) {
+$('#editView-pdService-reviewers').on('select2:select', function (e) {
var heightValue = $('#editView-pdService-reviewer').height();
var resultValue = heightValue + 20;
$('#editView-pdService-reviewer').css('height', resultValue + 'px');
Index: arms/js/reqAdd.js
===================================================================
diff -u -rc7c33a08a1010cccc85de68482bcf6b34a27cc49 -r39632cec5a85b3450f59c5991cd4e5db4c3a1930
--- arms/js/reqAdd.js (.../reqAdd.js) (revision c7c33a08a1010cccc85de68482bcf6b34a27cc49)
+++ arms/js/reqAdd.js (.../reqAdd.js) (revision 39632cec5a85b3450f59c5991cd4e5db4c3a1930)
@@ -9,6 +9,7 @@
$(this).select2($(this).data());
});
+ //제품 서비스 셀렉트 박스
$.ajax({
url: "/auth-user/api/arms/pdservice/getPdServiceMonitor.do",
type: "GET",
@@ -53,12 +54,44 @@
}
// --- select2 ( 제품(서비스) 검색 및 선택 ) --- //
-$('#country').on('select2:selecting', function (e) {
+$('#country').on('select2:select', function (e) {
// 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도
// 디폴트는 base version 을 선택하게 하고 ( select all )
console.log("check -> " + $('#country').val());
jsTreeBuild("#productTree", "reqAdd/T_ARMS_REQADD_" + $('#country').val());
+
+ $(".multiple-select option").remove();
+ $.ajax({
+ url: "/auth-user/api/arms/pdversion/getVersion.do?c_id=" + $('#country').val(),
+ type: "GET",
+ contentType: "application/json;charset=UTF-8",
+ dataType : "json",
+ progress: true
+ }).done(function(data) {
+
+ for(var k in data){
+ var obj = data[k];
+ //var jira_name = obj.c_title;
+ selectConnectID = obj.c_id;
+ console.log("selectConnectID==" + selectConnectID);
+
+ var $opt = $('', {
+ value: obj.c_id,
+ text: obj.c_title,
+ })
+
+ $('.multiple-select').append($opt);
+ }
+
+ $('.multiple-select').multipleSelect('refresh');
+
+
+ }).fail(function(e) {
+ console.log("fail call");
+ }).always(function() {
+ console.log("always call");
+ });
});
// 신규 제품(서비스) 등록 버튼
Index: arms/reqAdd.html
===================================================================
diff -u -r55557ba836b37a3ab140382cca713941cb4f5ab9 -r39632cec5a85b3450f59c5991cd4e5db4c3a1930
--- arms/reqAdd.html (.../reqAdd.html) (revision 55557ba836b37a3ab140382cca713941cb4f5ab9)
+++ arms/reqAdd.html (.../reqAdd.html) (revision 39632cec5a85b3450f59c5991cd4e5db4c3a1930)
@@ -363,7 +363,7 @@
-
+
Index: reference/jquery-plugins/multiple-select-1.5.2/dist/multiple-select-bluelight.css
===================================================================
diff -u
--- reference/jquery-plugins/multiple-select-1.5.2/dist/multiple-select-bluelight.css (revision 0)
+++ reference/jquery-plugins/multiple-select-1.5.2/dist/multiple-select-bluelight.css (revision 39632cec5a85b3450f59c5991cd4e5db4c3a1930)
@@ -0,0 +1,187 @@
+@charset "UTF-8";
+/**
+ * @author zhixin wen
+ */
+.ms-offscreen {
+ clip: rect(0 0 0 0) !important;
+ width: 1px !important;
+ height: 1px !important;
+ border: 0 !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ overflow: hidden !important;
+ position: absolute !important;
+ outline: 0 !important;
+ left: auto !important;
+ top: auto !important; }
+
+.ms-parent {
+ display: inline-block;
+ position: relative;
+ vertical-align: middle; }
+
+.ms-choice {
+ background: rgba(51, 51, 51, 0.4) !important;
+ border: 1px solid rgba(51, 51, 51, 0.425) !important;
+ display: block;
+ width: 100%;
+ height: 26px;
+ padding: 0;
+ overflow: hidden;
+ cursor: pointer;
+ border: 1px solid #aaa;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 26px;
+ color: #444;
+ text-decoration: none;
+ border-radius: 4px; }
+.ms-choice.disabled {
+ background-color: #f4f4f4;
+ background-image: none;
+ border: 1px solid #ddd;
+ cursor: default; }
+.ms-choice > span {
+ color: #f8f8f8;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 20px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ padding-left: 8px; }
+.ms-choice > span.placeholder {
+ color: #999; }
+.ms-choice > div.icon-close {
+ position: absolute;
+ top: 0px;
+ right: 16px;
+ height: 100%;
+ width: 16px; }
+.ms-choice > div.icon-close:before {
+ content: '×';
+ color: #888;
+ font-weight: bold;
+ position: absolute;
+ top: 50%;
+ margin-top: -14px; }
+.ms-choice > div.icon-close:hover:before {
+ color: #333; }
+.ms-choice > div.icon-caret {
+ position: absolute;
+ width: 0;
+ height: 0;
+ top: 50%;
+ right: 8px;
+ margin-top: -2px;
+ border-color: #888 transparent transparent transparent;
+ border-style: solid;
+ border-width: 5px 4px 0 4px; }
+.ms-choice > div.icon-caret.open {
+ border-color: transparent transparent #888 transparent;
+ border-width: 0 4px 5px 4px; }
+
+.ms-drop {
+ background: rgba(51, 51, 51, 0.95) !important;
+ border: 1px solid rgba(51, 51, 51, 0.425) !important;
+ width: auto;
+ min-width: 100%;
+ overflow: hidden;
+ display: none;
+ margin-top: -1px;
+ padding: 0;
+ position: absolute;
+ z-index: 1000;
+ background: #fff;
+ color: #000;
+ border-radius: 4px; }
+.ms-drop.bottom {
+ top: 100%;
+ box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); }
+.ms-drop.top {
+ bottom: 100%;
+ box-shadow: 0 -4px 5px rgba(0, 0, 0, 0.15); }
+
+.ms-search {
+ display: inline-block;
+ margin: 0;
+ min-height: 26px;
+ padding: 2px;
+ position: relative;
+ white-space: nowrap;
+ width: 100%;
+ z-index: 10000;
+ box-sizing: border-box; }
+.ms-search input {
+ width: 100%;
+ height: auto !important;
+ min-height: 24px;
+ padding: 0 5px;
+ margin: 0;
+ outline: 0;
+ font-family: sans-serif;
+ border: 1px solid #aaa;
+ border-radius: 5px;
+ box-shadow: none; }
+
+.ms-drop ul {
+ overflow: auto;
+ margin: 0;
+ padding: 0; }
+.ms-drop ul > li {
+ list-style: none;
+ display: list-item;
+ background-image: none;
+ position: static;
+ padding: .25rem 8px; }
+.ms-drop ul > li .disabled {
+ font-weight: normal !important;
+ opacity: .35;
+ filter: Alpha(Opacity=35);
+ cursor: default; }
+.ms-drop ul > li.multiple {
+ display: block;
+ float: left; }
+.ms-drop ul > li.group {
+ clear: both; }
+.ms-drop ul > li.multiple label {
+ width: 100%;
+ display: block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis; }
+.ms-drop ul > li label {
+ color: #f8f8f8;
+ position: relative;
+ padding-left: 1.25rem;
+ margin-bottom: 0;
+ font-weight: normal;
+ display: block;
+ white-space: nowrap;
+ cursor: pointer; }
+.ms-drop ul > li label.optgroup {
+ font-weight: bold; }
+.ms-drop ul > li.hide-radio {
+ padding: 0; }
+.ms-drop ul > li.hide-radio:focus, .ms-drop ul > li.hide-radio:hover {
+ background-color: #f8f9fa; }
+.ms-drop ul > li.hide-radio.selected {
+ color: #fff;
+ background-color: #007bff; }
+.ms-drop ul > li.hide-radio label {
+ margin-bottom: 0;
+ padding: 5px 8px; }
+.ms-drop ul > li.hide-radio input {
+ display: none; }
+.ms-drop ul > li.option-level-1 label {
+ padding-left: 28px; }
+
+.ms-drop input[type="radio"], .ms-drop input[type="checkbox"] {
+ position: absolute;
+ margin-top: .3rem;
+ margin-left: -1.25rem; }
+
+.ms-drop .ms-no-results {
+ display: none; }