From dd7e78ae9a5732ec89f65a8c51ee894947bafcb6 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 16 11월 2021 11:07:33 +0900
Subject: [PATCH] - 전체 프로젝트 선택시 이슈유형에 프로젝트 설정 되어 있는 항목만 리스트로 가져오도록 수정
---
src/main/webapp/views/project/projectList.html | 5 ++++-
src/main/resources/mybatis/query-template/issueType-template.xml | 3 +++
src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java | 17 +++++++++++++++--
src/main/webapp/scripts/app/common/common.controller.js | 1 +
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
index d5e9b9d..bb42b03 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.condition;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
import java.util.Map;
@@ -15,11 +16,15 @@
private Long workspaceId;
private Long projectId;
private String deep; // �긽�꽭 議고쉶�뿉�꽌 媛��졇�삱 �뜲�씠�꽣�쓽 醫낅쪟瑜� 寃곗젙�븳�떎.
+ private boolean UseProject = false; // �봽濡쒖젥�듃�뿉�꽌 �궗�슜以묒씤 �씠�뒋���엯�쓣 媛��졇�삱�븣 �궗�슜
public IssueTypeCondition(){}
- public static IssueTypeCondition make(Map<String, Object> conditions) {
- IssueTypeCondition condition = ConvertUtil.convertMapToClass(conditions, IssueTypeCondition.class);
+ public static IssueTypeCondition make(Map<String, Object> params) {
+ IssueTypeCondition condition = ConvertUtil.convertMapToClass(params, IssueTypeCondition.class);
+ if (MapUtil.getString(params, "useProject") != null) {
+ condition.setUseProject(MapUtil.getBoolean(params, "useProject"));
+ }
return condition;
}
@@ -78,4 +83,12 @@
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
+
+ public boolean isUseProject() {
+ return UseProject;
+ }
+
+ public void setUseProject(boolean useProject) {
+ UseProject = useProject;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index cdc7a7e..fef510b 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -19,6 +19,9 @@
<if test="projectId != '' and projectId != null">
AND it.project_id like CONCAT('%',#{projectId},'%')
</if>
+ <if test="useProject != '' and useProject != null and useProject == true">
+ AND it.project_id IS NOT NULL
+ </if>
AND ws.id = #{workspaceId}
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index ca13508..3ced6ea 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -211,6 +211,7 @@
// �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
var conditions = {
projectId : projectId > -1 ? projectId : null,
+ useProject : true,
deep : "01" // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� 李얜뒗�떎.
}
diff --git a/src/main/webapp/views/project/projectList.html b/src/main/webapp/views/project/projectList.html
index 5713f13..999625a 100644
--- a/src/main/webapp/views/project/projectList.html
+++ b/src/main/webapp/views/project/projectList.html
@@ -20,9 +20,11 @@
<li class="nav-item">
<a class="nav-link cursor" ng-class="{ 'active' : vm.tab == 'PROJECT_LIST' }" ng-click="fn.changeTab('PROJECT_LIST')" translate="project.normalList">�씪媛� 紐⑸줉</a>
</li>
+ <!--
<li class="nav-item">
<a class="nav-link cursor" ng-class="{ 'active' : vm.tab == 'PROJECT_TIMELINE' }" ng-click="fn.changeTab('PROJECT_TIMELINE')" translate="project.timeLine">���엫 �씪�씤</a>
</li>
+ -->
</ul>
</div>
</div>
@@ -32,9 +34,10 @@
<div ng-show="vm.tab == 'PROJECT_LIST'">
<div ng-include include-replace src="'views/project/projectListNormal.html'"></div>
</div>
-
+<!--
<div ng-show="vm.tab == 'PROJECT_TIMELINE'">
<div ng-include include-replace src="'views/project/projectListTimeline.html'"></div>
</div>
+ -->
</div>
--
Gitblit v1.8.0