From bab30d6a2aad0810fea7d5238c10c7635e94e604 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 14:33:30 +0900
Subject: [PATCH] 이슈리스트, 이슈상세 API로 추가된 이슈 표시
---
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 9 +++++++++
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 9 +++++++++
src/main/resources/mybatis/query-template/issue-template.xml | 1 +
src/main/webapp/views/issue/issueDetail.html | 4 ++--
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index 5ac8406..69600a2 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -31,6 +31,7 @@
private Long severityId;
private String severityName;
private String severityColor;
+ private String isApi;
private ProjectVo projectVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private IssueStatusVo issueStatusVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private IssueTypeVo issueTypeVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
@@ -231,6 +232,14 @@
this.severityColor = severityColor;
}
+ public String getIsApi() {
+ return isApi;
+ }
+
+ public void setIsApi(String isApi) {
+ this.isApi = isApi;
+ }
+
public Boolean getModifyPermissionCheck() {
return modifyPermissionCheck;
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
index 911ce7d..7b59d3b 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -34,6 +34,7 @@
private Long workspaceId;
private String projectType;
private String deep;
+ private String isApi;
private Long parentIssueId; // �긽�쐞 �씪媛�
private String useValue;
private List<Long> projectIds = Lists.newArrayList();
@@ -296,6 +297,14 @@
this.deep = deep;
}
+ public String getIsApi() {
+ return isApi;
+ }
+
+ public void setIsApi(String isApi) {
+ this.isApi = isApi;
+ }
+
public List<Long> getProjectIds() {
return projectIds;
}
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index de85a12..fd3b331 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -15,6 +15,7 @@
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
issue.register_date as registerDate,
+ issue.is_api as isApi,
SUBSTRING(issue.modify_date, 1, 19) as modifyDate,
project.id as projectId,
project.name as projectName,
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 538bf7a..27e2501 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -87,7 +87,7 @@
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
<span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
- <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+ <span class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
<div class="">
@@ -97,7 +97,7 @@
<span class="ticket-header">
<div class="tasks-header-w">
<span class="tags">
- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>
+ <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}} / <span>API : {{vm.viewer.isApi}}</span></span>
</span>
</div>
</span>
--
Gitblit v1.8.0