충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 src/main/webapp/views/issue/issueModify.html

@@ -39,7 +39,7 @@
                                                source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
                                                page="vm.autoCompletePage.project.page"
                                                total-page="vm.autoCompletePage.project.totalPage"
                                                input-disabled="false"
                                                input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
                                                translation-texts="{ empty : 'common.emptyProject' }"
                                                extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -241,6 +241,51 @@
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <div ng-switch-when="NUMBER">
                                    <input type="text" class="form-control input-sm"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <div ng-switch-when="DATETIME">
                                    <input type="text" class="form-control input-sm"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <div ng-switch-when="IP_ADDRESS">
                                    <input type="text" class="form-control input-sm"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <div ng-switch-when="SITE">
                                    <input type="text" class="form-control input-sm"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <div ng-switch-when="TEL">
                                    <input type="text" class="form-control input-sm"
                                           ng-model="issueCustomField.useValues"
                                           maxlength="100"
                                           autocomplete="off"
                                           kr-input
                                           ng-required="issueCustomField.fieldOption == '01'">
                                </div>

                                <!-- 단일 셀렉트 -->
                                <div ng-switch-when="SINGLE_SELECT">
                                    <select class="form-control input-sm issue-select-label"
@@ -270,7 +315,7 @@
                </div>
            </div>
            <hr>
            <div class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span>
@@ -278,7 +323,7 @@
                </div>
            </div>

            <div class="row">
            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="companyField.name">업체이름</span> </label>
@@ -362,7 +407,7 @@
                </div>
            </div>
            <p></p>
            <div class="row">
            <div ng-show="fn.containsPartner('ISP')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>
@@ -370,7 +415,7 @@
                </div>
            </div>

            <div class="row">
            <div ng-show="fn.containsPartner('ISP')"  class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="ispField.name">ISP 이름</span> </label>
@@ -468,7 +513,7 @@
                </div>
            </div>
            <p></p>
            <div class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">호스팅 정보</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>
@@ -476,7 +521,7 @@
                </div>
            </div>

            <div class="row">
            <div ng-show="fn.containsPartner('호스팅')" class="row">
                <div class="col-lg-4">
                    <div class="form-group mb10">
                        <label class="issue-label"> <span translate="hostingField.name">호스팅 이름</span> </label>