충돌 수정

이민희

2021-12-01 5fb1952ae91f1a739803247266e87dbd15ea1f27

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

@@ -16,8 +16,8 @@
                                                   maxlength="300"
                                                   kr-input
                                                   owl-auto-focus
                                                   ng-model="vm.search.title"
                                                   placeholder="{{'issue.pleaseEnterIssueName' | translate}}">
                                                   ng-model="vm.search.keyWord"
                                                   placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}">
                                            <div class="input-group-prepend ml-10">
                                                <button class="btn btn-navy" ng-click="fn.getPageList(0)"> <span translate="common.search">검색</span></button>
                                            </div>
@@ -29,6 +29,12 @@
                                    <div class="col-sm-12">
                                        <div class="tabfilter">
                                            <div translate="common.selectedSearchCriteria">선택한 검색 조건</div>
                                            <!--    이슈 제목   -->
                                            <p ng-if="$root.isDefined(vm.search.title)">
                                                {{vm.search.title}}
                                                <span ng-click="vm.search.title = ''">×</span>
                                            </p>

                                            <!--    프로젝트    -->
                                            <issue-search-array-view-element lists="vm.projects"
                                                                             type="'project'"></issue-search-array-view-element>
@@ -40,12 +46,6 @@
                                            <!--    이슈 상태   -->
                                            <issue-search-field-key-view-element lists="vm.issueStatuses"
                                                                                 keys="vm.search.issueStatusIds"></issue-search-field-key-view-element>

                                            <!--    이슈 번호   -->
                                            <p ng-if="$root.isDefined(vm.search.combinationIssueNumber)">
                                                {{vm.search.combinationIssueNumber}}
                                                <span ng-click="vm.search.combinationIssueNumber = ''">×</span>
                                            </p>

                                            <!--    이슈 내용   -->
                                            <p ng-if="$root.isDefined(vm.search.description)">
@@ -104,6 +104,19 @@
                                        <div class="row">
                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="issue.issueTitle">이슈 제목</span></label>
                                                    <input type="text"
                                                           name="title"
                                                           class="form-control input-sm"
                                                           kr-input
                                                           maxlength="20"
                                                           autocomplete="off"
                                                           ng-model="vm.search.title">
                                                </div>
                                            </div>

                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="common.project">프로젝트</span></label>
                                                    <js-autocomplete-multi data-input-name="projects"
                                                                           selected-model="vm.projects"
@@ -134,7 +147,9 @@
                                                                             options="::vm.issueStatuses"></ng-dropdown-multiselect>
                                                </div>
                                            </div>
                                        </div>

                                        <div class="row">
                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="issue.issueNumber">이슈 번호</span></label>
@@ -147,9 +162,7 @@
                                                           ng-model="vm.search.combinationIssueNumber">
                                                </div>
                                            </div>
                                        </div>

                                        <div class="row">
                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="issue.issueContent">이슈 내용</span></label>
@@ -180,20 +193,6 @@
                                                                             data-input-name="severities"
                                                                             selected-model="vm.search.severityIds"
                                                                             options="::vm.severities"></ng-dropdown-multiselect>
                                                </div>
                                            </div>

                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="common.assigneeTeam">담당부서</span></label>
                                                    <js-autocomplete-multi data-input-name="users"
                                                                           selected-model="vm.users"
                                                                           search="vm.userName"
                                                                           input-disabled="false"
                                                                           source="fn.getUserList(vm.userName, vm.users)"
                                                                           translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
                                                                           extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'user', maxlength : 100 }">
                                                    </js-autocomplete-multi>
                                                </div>
                                            </div>
                                        </div>
@@ -254,6 +253,20 @@
                                                </div>
                                            </div>

                                            <div class="col-lg-3">
                                                <div class="form-group">
                                                    <label> <span translate="common.assigneeTeam">담당부서</span></label>
                                                    <js-autocomplete-multi data-input-name="departments"
                                                                           selected-model="vm.departments"
                                                                           search="vm.departmentName"
                                                                           input-disabled="false"
                                                                           source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
                                                                           translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
                                                                           extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
                                                    </js-autocomplete-multi>
                                                </div>
                                            </div>

                                            <div class="col-lg-3" ng-repeat="customField in vm.customFields">
                                                <label>{{::customField.name}}</label>