From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 4fe4e8b..53ddc18 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -61,6 +61,7 @@
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
completeDateRange : "", // �셿猷뚯씪 湲곌컙 寃��깋
+ dateRange : "", // 湲곌컙 寃��깋
severityIds : [], // 以묒슂�룄 寃��깋
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
@@ -495,6 +496,7 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
+ dateRange: "",
hideCompleteIssue: $scope.vm.hideCompleteIssue,
hideDownIssue : $scope.vm.hideDownIssue,
isTree : $scope.vm.listMode === 1,
@@ -618,6 +620,10 @@
conditions.beginCompleteDate = completeDateRange[0].trim();
conditions.endCompleteDate = completeDateRange[1].trim();
}
+ // 湲곌컙
+ if ($rootScope.isDefined($scope.vm.search.dateRange)) {
+ conditions.dateRange = $scope.vm.search.dateRange.trim();
+ }
return conditions;
--
Gitblit v1.8.0