From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 e9d4f91..a000400 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -98,16 +98,16 @@
switch (projectType) {
case BTS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99", 0L)); // 踰꾧렇
- issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe", 0L)); // 媛쒖꽑
+ issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99", 0L, false)); // 踰꾧렇
+ issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe", 0L, false)); // 媛쒖꽑
break;
case RMS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2", 0L)); // �슂援� �궗�빆
+ issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2", 0L, false)); // �슂援� �궗�빆
break;
case TCM_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7", 0L)); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
+ issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7", 0L, false)); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
break;
}
this.issueTypeRepository.saveAll(issueTypes);
@@ -154,6 +154,8 @@
this.setDepartmentOfProject(project, workflow);
issueType.setUsePartner(issueTypeForm.getUsePartner());
+
+ issueType.setInheritPartners(issueTypeForm.getInheritPartners());
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -435,6 +437,8 @@
issueType.setUsePartner(issueTypeForm.getUsePartner());
+ issueType.setInheritPartners(issueTypeForm.getInheritPartners());
+
/*if(issueTypeForm.getCompanyId() != null){
CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
issueType.setCompanyField(companyField);
--
Gitblit v1.8.0