From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/views/issue/issueListNormal.html | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index a85a020..7575114 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/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="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.emptyDepartment' }"
- 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>
--
Gitblit v1.8.0