From 6565e26508224b5d1de1ff7cf0f263fe196790e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:54:06 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueListNormal.html | 14 ++++++++++++--
src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js | 4 ++++
src/main/webapp/scripts/app/issue/issueList.controller.js | 2 ++
src/main/webapp/assets/styles/main.css | 3 +++
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index db6b721..778a1ea 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -5344,6 +5344,9 @@
-ms-flex: 1 1 auto;
flex: 1 1 auto;
padding: 1rem;
+ overflow-y: auto;
+ overflow-x: hidden;
+ max-height: 800px;
}
.modal-footer {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index ac4cece..d653831 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -56,6 +56,7 @@
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
+ issueNumber : "",
projectType : "BTS_PROJECT", // �봽濡쒖젥�듃 �쑀�삎
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
@@ -453,6 +454,7 @@
keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
+ issueNumber : $scope.vm.search.issueNumber,
projectType : $scope.vm.search.projectType,
combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
beginRegisterDate : "",
diff --git a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
index 5f59bb8..95786b3 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
@@ -52,6 +52,10 @@
case "project":
makeTag += list.name;
break;
+
+ case "department":
+ makeTag += list.byName;
+ break;
}
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index fd0fa64..2f018a6 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -47,6 +47,12 @@
<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.issueNumber)">
+ {{vm.search.issueNumber}}
+ <span ng-click="vm.search.issueNumber = ''">횞</span>
+ </p>
+
<!-- �씠�뒋 �궡�슜 -->
<p ng-if="$root.isDefined(vm.search.description)">
{{vm.search.description}}
@@ -86,6 +92,10 @@
{{vm.search.registerDateRange}}
<span ng-click="vm.search.registerDateRange = ''">횞</span>
</p>
+
+ <!-- �떞�떦遺��꽌 -->
+ <issue-search-array-view-element lists="vm.departments"
+ type="'department'"></issue-search-array-view-element>
<!-- �뀓�뒪�듃 �엯�젰 �븘�뱶 -->
<issue-search-custom-field-view-element
@@ -154,12 +164,12 @@
<div class="form-group">
<label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
<input type="text"
- name="name"
+ name="issueNumber"
class="form-control input-sm"
autocomplete="off"
kr-input
maxlength="20"
- ng-model="vm.search.combinationIssueNumber">
+ ng-model="vm.search.issueNumber">
</div>
</div>
--
Gitblit v1.8.0