From 57b7f271f8bba85ea161a609ed5e01dd9495fed7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 18:01:54 +0900
Subject: [PATCH] - 이슈 상태명 특수문자 입력 가능하도록 수정 - 이슈유형 리스트에서 파트너 정보 보여주기
---
src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java | 9 +++++++++
src/main/webapp/scripts/app/issueType/issueTypeList.controller.js | 7 +++++++
src/main/webapp/views/issueStatus/issueStatusAdd.html | 4 ++--
src/main/resources/mybatis/query-template/issueType-template.xml | 3 ++-
src/main/webapp/i18n/ko/global.json | 1 +
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 11 +++++++++++
src/main/webapp/views/issueStatus/issueStatusModify.html | 4 ++--
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 20 +++++++++++++++++---
8 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 561db3a..b6df835 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -247,9 +247,6 @@
Long totalCount = this.issueTypeMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
List<IssueTypeVo> issueTypeVos = ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
-// for (IssueTypeVo issueTypeVo : issueTypeVos) {
-//
-// }
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
if (condition.getDeep() != null) {
@@ -261,6 +258,7 @@
/*this.setUseIssueTypeByCompanyField(issueTypeVos);
this.setUseIssueTypeByIspField(issueTypeVos);
this.setUseIssueTypeByHostingField(issueTypeVos);*/
+ this.setUsePartner(issueTypeVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -287,6 +285,22 @@
}
}
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뙆�듃�꼫 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUsePartner(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos) {
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ if (issueTypeVo.getUsePartners() != null) {
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(issueTypeVo.getUsePartners(), usePartner);//3, 1 / 3, 2 / 3, 4
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
+ }
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
+ }
+ }
+ }
+
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos) {
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java b/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
index 94a8ab7..ae3d8de 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
@@ -17,6 +17,7 @@
private ProjectVo projectVo;
private IssueStatusVo completeIssueStatusVo;
+ private Integer usePartners;
private List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
private Boolean modifyPermissionCheck = Boolean.TRUE; // �씠�뒋 �쑀�삎�� 紐⑤뱺 �궗�엺�뱾�씠 �닔�젙, �궘�젣�븷 �닔 �엳�뼱�꽌 湲곕낯 媛믪씠 True
@@ -94,4 +95,12 @@
public void setCompleteIssueStatusVo(IssueStatusVo completeIssueStatusVo) {
this.completeIssueStatusVo = completeIssueStatusVo;
}
+
+ public Integer getUsePartners() {
+ return usePartners;
+ }
+
+ public void setUsePartners(Integer usePartners) {
+ this.usePartners = usePartners;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index 38bf993..1d387f4 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -9,7 +9,8 @@
it.name as name,
it.description as description,
it.color as color,
- it.project_id as projectId
+ it.project_id as projectId,
+ it.use_partner AS usePartners
FROM
issue_type it
INNER JOIN workspace ws on it.workspace_id = ws.id
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 454e91e..f4160fe 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -92,6 +92,17 @@
}
break;
+ // �궗�슜 �뙆�듃�꼫 �씠由�(�씠�뒋 �쑀�삎 由ъ뒪�듃�뿉�꽌 �궗�슜)
+ case "USE_PARTNERS" :
+ if (scope.data.usePartnerVos != null) {
+ var usePartners = [];
+ for (var i=0; i<scope.data.usePartnerVos.length; i++) {
+ usePartners.push(scope.data.usePartnerVos[i].byName);
+ }
+ makeTag += "<span>" + usePartners + "</span>";
+ }
+ break;
+
// �봽濡쒖젥�듃 紐⑸줉�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙 �몴�떆
case "CUSTOM_FIELD_CONFIG" :
// 愿�由ъ옄留� �닔�젙�븷 �닔 �엳�떎.
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index e70ed71..7319699 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -356,6 +356,7 @@
"normalList" : "�씠�뒋 紐⑸줉",
"timeLine" : "���엫 �씪�씤",
"useProjects" : "�궗�슜 �봽濡쒖젥�듃",
+ "usePartners" : "�궗�슜 �뙆�듃�꼫",
"companyInfo" : "�뾽泥�/ISP/�샇�뒪�똿",
"downIssue": "�븯�쐞 �씠�뒋",
"downIssueTitle": "�븯�쐞 �씠�뒋 �젣紐�",
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeList.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeList.controller.js
index a04ac72..990d0b0 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeList.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeList.controller.js
@@ -70,6 +70,13 @@
.setDAlign("text-center")
.setDRenderer("PROJECT_BASIC_NAME"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("issue.usePartners")
+ .setHWidth("bold")
+ .setDType("renderer")
+ .setDName("partners")
+ .setDAlign("text-center")
+ .setDRenderer("USE_PARTNERS"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.color")
.setHWidth("width-140-p bold")
.setDType("renderer")
diff --git a/src/main/webapp/views/issueStatus/issueStatusAdd.html b/src/main/webapp/views/issueStatus/issueStatusAdd.html
index 6e1fe46..7ef042d 100644
--- a/src/main/webapp/views/issueStatus/issueStatusAdd.html
+++ b/src/main/webapp/views/issueStatus/issueStatusAdd.html
@@ -18,7 +18,7 @@
class="form-control"
autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
autocomplete="off"
maxlength="20"
ng-model="vm.form.name"
@@ -27,7 +27,7 @@
<small ng-show="issueStatusAddForm.name.$error.maxlength" class="help-block form-text text-danger" translate="common.upTo20Characters">
理쒕� 20湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
- <small translate="managementStatus.limitNameToSpecialCharacters">�씠�뒋 �긽�깭 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="managementStatus.limitNameToSpecialCharacters">�씠�뒋 �긽�깭 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
diff --git a/src/main/webapp/views/issueStatus/issueStatusModify.html b/src/main/webapp/views/issueStatus/issueStatusModify.html
index 597a55e..b65e26e 100644
--- a/src/main/webapp/views/issueStatus/issueStatusModify.html
+++ b/src/main/webapp/views/issueStatus/issueStatusModify.html
@@ -18,7 +18,7 @@
class="form-control"
autofocus
autocomplete="off"
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
ng-model="vm.form.name"
maxlength="20"
kr-input
@@ -30,7 +30,7 @@
<div class="help-block form-text text-danger" ng-show="vm.form.useYn" translate="managementStatus.useInTheWorkflow">
�썙�겕�뵆濡쒖슦�뿉�꽌 �씠�뒋 �긽�깭媛� �궗�슜以묒엯�땲�떎. �씠由� 蹂�寃쎌떆 �씠�뒋 �긽�깭瑜� �궗�슜�븯�뒗 紐⑤뱺 �썙�겕�뵆濡쒖슦�뿉 �씠�뒋 �긽�깭 紐낆씠 蹂�寃쎈맗�땲�떎.
</div>
- <small translate="managementStatus.limitNameToSpecialCharacters">�씠�뒋 �긽�깭 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="managementStatus.limitNameToSpecialCharacters">�씠�뒋 �긽�깭 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
--
Gitblit v1.8.0