From f2ad0cefdd2fc83040a5d915a2c7dd37783f4395 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 22:44:24 +0900
Subject: [PATCH] useCompany -> usePartner 명칭 변경 * DB 초기화 필요
---
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 12 +-
src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java | 2
src/main/webapp/views/issueType/issueTypeAdd.html | 2
src/main/webapp/scripts/components/HostingField/hostingField.service.js | 4
src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java | 2
src/main/java/kr/wisestone/owl/constant/UsePartner.java | 42 ++++++++
src/main/webapp/scripts/app/issue/issueModify.controller.js | 12 +-
src/main/java/kr/wisestone/owl/domain/IssueType.java | 10 +-
src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java | 11 +-
src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js | 4
src/main/resources/migration/V1_11__Alter_Table.sql | 2
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js | 2
src/main/java/kr/wisestone/owl/vo/IspFieldVo.java | 2
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 21 ++--
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 27 +---
src/main/webapp/views/issueType/issueTypeModify.html | 2
src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js | 6
src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java | 24 ++--
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 8
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 4
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 6
/dev/null | 43 --------
src/main/java/kr/wisestone/owl/vo/UsePartnerVo.java | 16 +-
src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java | 12 -
src/main/webapp/i18n/ko/global.json | 2
25 files changed, 127 insertions(+), 151 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/UseCompany.java b/src/main/java/kr/wisestone/owl/constant/UseCompany.java
deleted file mode 100644
index ba349f2..0000000
--- a/src/main/java/kr/wisestone/owl/constant/UseCompany.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package kr.wisestone.owl.constant;
-
-import com.google.common.collect.Lists;
-import kr.wisestone.owl.vo.HostingFieldVo;
-import kr.wisestone.owl.vo.UseCompanyVo;
-
-import java.util.List;
-
-public class UseCompany {
-
- public static final int USE_COMPANY_HOSTING = 4; // 100
- public static final int USE_COMPANY_ISP = 2; // 010
- public static final int USE_COMPANY_COMPANY = 1; // 001
-
- public static String[] Names = {"�뾽泥�", "ISP", "�샇�뒪�똿"};
- public static int[] useCompanies = {USE_COMPANY_COMPANY, USE_COMPANY_ISP, USE_COMPANY_HOSTING};
-
- // �뾽泥�/ISP/�샇�뒪�똿 �젙蹂� �쑀臾� 泥댄겕 �썑 UseCompanyVo.Create
- public static UseCompanyVo checkUseCompany(int using, int useAbleCompany) //using - DB�뿉 ���옣�맂 媛�, useAbleCompany - 媛� �뾽泥대뱾�쓽 �떎�젣 媛�
- {
- if (((using & useAbleCompany) != 0)) {
- Long Id = 0L;
- if (useAbleCompany != USE_COMPANY_COMPANY) {
- Id = useAbleCompany / 2L;
- }
- return UseCompanyVo.Create(Id, Names[Id.intValue()]);
- }
- return null;
- }
-
- // �뾽泥�/ISP/�샇�뒪�똿 �쟾泥� 紐⑸줉 媛��졇�삤湲�
- public static List<UseCompanyVo> getCompanyList() {
- List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
-
- Long index = 0L;
- for (String name : UseCompany.Names) {
- useCompanyVos.add(UseCompanyVo.Create(index, name));
- index++;
- }
- return useCompanyVos;
- }
-
-}
diff --git a/src/main/java/kr/wisestone/owl/constant/UsePartner.java b/src/main/java/kr/wisestone/owl/constant/UsePartner.java
new file mode 100644
index 0000000..6b766ca
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/constant/UsePartner.java
@@ -0,0 +1,42 @@
+package kr.wisestone.owl.constant;
+
+import com.google.common.collect.Lists;
+import kr.wisestone.owl.vo.UsePartnerVo;
+
+import java.util.List;
+
+public class UsePartner {
+
+ public static final int USE_PARTNER_HOSTING = 4; // 100
+ public static final int USE_PARTNER_ISP = 2; // 010
+ public static final int USE_PARTNER_COMPANY = 1; // 001
+
+ public static String[] Names = {"�뾽泥�", "ISP", "�샇�뒪�똿"};
+ public static int[] partners = {USE_PARTNER_COMPANY, USE_PARTNER_ISP, USE_PARTNER_HOSTING};
+
+ // �뾽泥�/ISP/�샇�뒪�똿 �젙蹂� �쑀臾� 泥댄겕 �썑 UsePartnerVo.Create
+ public static UsePartnerVo checkUsePartner(int using, int usePartner) //using - DB�뿉 ���옣�맂 媛�, useAbleCompany - 媛� �뾽泥대뱾�쓽 �떎�젣 媛�
+ {
+ if (((using & usePartner) != 0)) {
+ Long Id = 0L;
+ if (usePartner != USE_PARTNER_COMPANY) {
+ Id = usePartner / 2L;
+ }
+ return UsePartnerVo.Create(Id, Names[Id.intValue()]);
+ }
+ return null;
+ }
+
+ // �뾽泥�/ISP/�샇�뒪�똿 �쟾泥� 紐⑸줉 媛��졇�삤湲�
+ public static List<UsePartnerVo> getPartnerList() {
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+
+ Long index = 0L;
+ for (String name : UsePartner.Names) {
+ usePartnerVos.add(UsePartnerVo.Create(index, name));
+ index++;
+ }
+ return usePartnerVos;
+ }
+
+}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index cd9fbfc..b11f875 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueType.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java
@@ -21,7 +21,7 @@
private String name;
private String description;
private String color;
- private Long useCompany;
+ private Long usePartner;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "workspace_id")
@@ -125,11 +125,11 @@
this.project = project;
}
- public Long getUseCompany() {
- return useCompany;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setUseCompany(Long useCompany) {
- this.useCompany = useCompany;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
}
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 6514898..cdcc647 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -6,7 +6,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.constant.UseCompany;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -868,35 +868,24 @@
this.setDownIssues(issue, issueVo);
IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
- Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
- List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
- for (Integer useAbleCompany : UseCompany.useCompanies) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
- UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
- if (useCompanyVo != null) {
- useCompanyVos.add(useCompanyVo);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
//useCompanyVo.setValues();
}
- issueVo.setUseCompanyVo(useCompanyVos);
+ issueVo.setUsePartnerVos(usePartnerVos);
}
-
-// List<UseCompanyVo> useCompanyVoList =issueVo.getIssueTypeVo().getUseCompanyVos();
-// for (Integer useCompany : UseCompany.useCompanies) {
-// UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
-//
-// if (useCompanyVo != null) {
-// useCompanyVoList.add(useCompanyVo);
-// }
-// }
this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
-
this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
-
}
// �긽�쐞�씪媛� �젙蹂� 異붽�
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 0c425db..0be3c51 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -3,9 +3,8 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.constant.MngPermission;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.constant.UseCompany;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -125,7 +124,7 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- issueType.setUseCompany(issueTypeForm.getUseCompany());
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -249,17 +248,17 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
- Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0;
- List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
- for (Integer useAbleCompany : UseCompany.useCompanies) {// 1 // 2 // 4
- UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);//3, 1 / 3, 2 / 3, 4
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);//3, 1 / 3, 2 / 3, 4
- if (useCompanyVo != null) {
- useCompanyVos.add(useCompanyVo);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
}
}
- issueTypeVo.setUseCompanyVos(useCompanyVos);
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -288,7 +287,7 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- issueType.setUseCompany(issueTypeForm.getUseCompany());
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
/*if(issueTypeForm.getCompanyId() != null){
CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
diff --git a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
index ba8c0be..6d2a2cd 100644
--- a/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/CompanyFieldVo.java
@@ -1,6 +1,6 @@
package kr.wisestone.owl.vo;
-public class CompanyFieldVo extends UseCompanyVo{
+public class CompanyFieldVo extends UsePartnerVo {
private String manager;
private String tel;
diff --git a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
index 8c08f08..4320074 100644
--- a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
@@ -1,6 +1,6 @@
package kr.wisestone.owl.vo;
-public class HostingFieldVo extends UseCompanyVo {
+public class HostingFieldVo extends UsePartnerVo {
private String code;
private String manager;
diff --git a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
index 1d2e6f1..f81b69b 100644
--- a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
@@ -1,6 +1,6 @@
package kr.wisestone.owl.vo;
-public class IspFieldVo extends UseCompanyVo{
+public class IspFieldVo extends UsePartnerVo {
private String code;
private String manager;
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java b/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
index a23d46e..0ce164c 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueTypeVo.java
@@ -1,7 +1,6 @@
package kr.wisestone.owl.vo;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.Project;
import java.util.List;
@@ -16,7 +15,7 @@
private WorkflowVo workflowVo;
private ProjectVo projectVo;
- private List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
+ private List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
private Boolean modifyPermissionCheck = Boolean.TRUE; // �씠�뒋 �쑀�삎�� 紐⑤뱺 �궗�엺�뱾�씠 �닔�젙, �궘�젣�븷 �닔 �엳�뼱�꽌 湲곕낯 媛믪씠 True
@@ -78,11 +77,11 @@
this.projectVo = projectVo;
}
- public List<UseCompanyVo> getUseCompanyVos() {
- return useCompanyVos;
+ public List<UsePartnerVo> getUsePartnerVos() {
+ return usePartnerVos;
}
- public void setUseCompanyVos(List<UseCompanyVo> useCompanyVos) {
- this.useCompanyVos = useCompanyVos;
+ public void setUsePartnerVos(List<UsePartnerVo> usePartnerVos) {
+ this.usePartnerVos = usePartnerVos;
}
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index 0d975f9..9fc1672 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -1,7 +1,6 @@
package kr.wisestone.owl.vo;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.IssueTableConfig;
import java.util.ArrayList;
import java.util.List;
@@ -52,14 +51,13 @@
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
- //private Long parentIssueId; // �긽�쐞 �씪媛�
private IssueVo parentIssueVo;
private List<IssueCompanyVo> issueCompanyVos;
private List<IssueIspVo> issueIspVos;
private List<IssueHostingVo> issueHostingVos;
- private List<UseCompanyVo> useCompanyVo = Lists.newArrayList();
+ private List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
public IssueVo(){}
@@ -431,11 +429,11 @@
this.parentIssueVo = parentIssueVo;
}
- public List<UseCompanyVo> getUseCompanyVo() {
- return useCompanyVo;
+ public List<UsePartnerVo> getUsePartnerVos() {
+ return usePartnerVos;
}
- public void setUseCompanyVo(List<UseCompanyVo> useCompanyVo) {
- this.useCompanyVo = useCompanyVo;
+ public void setUsePartnerVos(List<UsePartnerVo> usePartnerVos) {
+ this.usePartnerVos = usePartnerVos;
}
}
diff --git a/src/main/java/kr/wisestone/owl/vo/UseCompanyVo.java b/src/main/java/kr/wisestone/owl/vo/UsePartnerVo.java
similarity index 61%
rename from src/main/java/kr/wisestone/owl/vo/UseCompanyVo.java
rename to src/main/java/kr/wisestone/owl/vo/UsePartnerVo.java
index eb3dc69..348d6f0 100644
--- a/src/main/java/kr/wisestone/owl/vo/UseCompanyVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UsePartnerVo.java
@@ -1,20 +1,20 @@
package kr.wisestone.owl.vo;
-public class UseCompanyVo extends BaseVo {
+public class UsePartnerVo extends BaseVo {
private Long id;
private String name;
private String byName;
- public UseCompanyVo() {
+ public UsePartnerVo() {
}
- public static UseCompanyVo Create(Long id, String name) {
- UseCompanyVo useCompanyVo = new UseCompanyVo();
- useCompanyVo.setName(name);
- useCompanyVo.setId(id);
- useCompanyVo.setByName(name);
+ public static UsePartnerVo Create(Long id, String name) {
+ UsePartnerVo usePartnerVo = new UsePartnerVo();
+ usePartnerVo.setName(name);
+ usePartnerVo.setId(id);
+ usePartnerVo.setByName(name);
- return useCompanyVo;
+ return usePartnerVo;
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
index db50054..51f8a3b 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
@@ -1,11 +1,8 @@
package kr.wisestone.owl.web.controller;
-import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.constant.UseCompany;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.service.HostingFieldService;
-import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.vo.HostingFieldVo;
import kr.wisestone.owl.web.condition.HostingFieldCondition;
import kr.wisestone.owl.web.form.HostingFieldForm;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +18,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@Controller
@@ -92,12 +88,12 @@
}
// �뾽泥�/ISP/�샇�뒪�똿 紐⑸줉 媛��졇�삤湲�
- @RequestMapping(value = "/company/getCompanyList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/company/getPartnerList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> getCompanyList(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> getPartnerList(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- resJsonData.put(Constants.REQ_KEY_CONTENT, UseCompany.getCompanyList());
+ resJsonData.put(Constants.REQ_KEY_CONTENT, UsePartner.getPartnerList());
return this.setSuccessMessage(resJsonData);
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
index e1b0e2b..039f3d9 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
@@ -1,13 +1,9 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.constant.UseCompany;
-import kr.wisestone.owl.domain.HostingField;
-import kr.wisestone.owl.domain.IssueType;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
-import kr.wisestone.owl.web.condition.HostingFieldCondition;
-import kr.wisestone.owl.web.controller.HostingFieldController;
import java.util.List;
import java.util.Map;
@@ -23,7 +19,7 @@
private Long workflowId;
private Long projectId;
private List<Long> removeIds = Lists.newArrayList();
- private Long useCompany;
+ private Long usePartner;
public IssueTypeForm(){}
@@ -37,13 +33,13 @@
if (MapUtil.getLongs(params, "companyIds") != null) {
// form.setRemoveIds(MapUtil.getLongs(params, "companyIds"));
List<Long> longs = MapUtil.getLongs(params, "companyIds");
- form.useCompany = 0L;
+ form.usePartner = 0L;
for (Long id : longs) {
- if (id == UseCompany.USE_COMPANY_COMPANY - 1) {
- form.useCompany += 1;
+ if (id == UsePartner.USE_PARTNER_COMPANY - 1) {
+ form.usePartner += 1;
} else {
- form.useCompany += id * 2;
+ form.usePartner += id * 2;
}
}
}
@@ -111,11 +107,11 @@
this.projectId = projectId;
}
- public Long getUseCompany() {
- return useCompany;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setUseCompany(Long useCompany) {
- this.useCompany = useCompany;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
}
}
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index 306646c..e89439e 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -208,4 +208,4 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- issue_type �뀒�씠釉� �뾽泥�,ISP,�샇�뒪�똿 而щ읆 異붽�
-ALTER TABLE `issue_type` ADD COLUMN `use_company` BIGINT(11) NOT NULL DEFAULT '0';
+ALTER TABLE `issue_type` ADD COLUMN `use_partner` BIGINT(11) NOT NULL DEFAULT '0';
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 5fcc82f..86869a5 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -556,7 +556,7 @@
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
"manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
- "manageUseCompanyPerm": "�뾽泥� 由ъ뒪�듃 愿�由�",
+ "manageUsePartnerPerm": "�뙆�듃�꼫 由ъ뒪�듃 愿�由�",
"manageUserPerm": "�궗�슜�옄 愿�由�",
"manageApiPerm" : "API 愿�由�",
"manageNoticePerm": "怨듭��궗�빆 愿�由�",
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index c742fcb..94947eb 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -314,8 +314,8 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.viewer.useCompanyVo != null) {
- $scope.vm.viewer.useCompanyVo.forEach(function (partnerVo) {
+ if ($scope.vm.viewer.usePartnerVo != null) {
+ $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 40acf5e..42f532e 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -656,9 +656,9 @@
$scope.vm.editor.issueStatus = false;
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
- if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
+ /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
$scope.$apply();
- }
+ }*/
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -786,8 +786,8 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.viewer.useCompanyVo != null) {
- $scope.vm.viewer.useCompanyVo.forEach(function (partnerVo) {
+ if ($scope.vm.viewer.usePartnerVo != null) {
+ $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 0ae8ec0..5c34166 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -43,7 +43,7 @@
};
$scope.vm = {
- companyVos : "",
+ partnerVos : "",
search : {
id : parameter.id,
deep : "02" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂�
@@ -144,7 +144,7 @@
});
$scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
- $scope.vm.companyVos = $scope.fn.getPartners();
+ $scope.vm.partnerVos = $scope.fn.getPartners();
});
@@ -666,8 +666,8 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.companyVos != null) {
- $scope.vm.companyVos.forEach(function (partnerVo) {
+ if ($scope.vm.partnerVos != null) {
+ $scope.vm.partnerVos.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
@@ -897,11 +897,11 @@
function getPartners() {
- HostingField.getCompanyList($resourceProvider.getContent(
+ HostingField.getPartnerList($resourceProvider.getContent(
{},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.companyVos = result.data.content;
+ $scope.vm.partnerVos = result.data.content;
}
});
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
index 4dd1907..2b3fa6e 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
@@ -16,7 +16,7 @@
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 auto complete callback function
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- removeUseCompany : removeUseCompany, // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
+ removeUsePartner : removeUsePartner, // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
formCheck : formCheck // �뤌 泥댄겕
};
@@ -122,7 +122,7 @@
}
// �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
- function removeUseCompany(index) {
+ function removeUsePartner(index) {
$scope.vm.form.companies.splice(index, 1);
}
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
index ab8f228..8818a3e 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
@@ -17,7 +17,7 @@
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- removeUseCompany : removeUseCompany, // �뾽泥�/isp/�샇�뒪�똿 �궘�젣
+ removeUsePartner : removeUsePartner, // �뾽泥�/isp/�샇�뒪�똿 �궘�젣
detail : detail // �긽�꽭 �젙蹂�
};
@@ -189,7 +189,7 @@
}
// �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
- function removeUseCompany(index) {
+ function removeUsePartner(index) {
$scope.vm.form.companies.splice(index, 1);
}
@@ -211,7 +211,7 @@
$scope.vm.form.projects.push(result.data.data.projectVo);
$scope.vm.projectName = result.data.data.projectVo.name;
}
- $scope.vm.form.companies = result.data.data.useCompanyVos;
+ $scope.vm.form.companies = result.data.data.usePartnerVos;
$scope.vm.form.color = result.data.data.color;
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
index f62ad14..c503870 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -25,7 +25,7 @@
permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
- permUseCompany : false,
+ permUsePartner : false,
permApi : false,
permNotice : false,
permFAQ : false,
diff --git a/src/main/webapp/scripts/components/HostingField/hostingField.service.js b/src/main/webapp/scripts/components/HostingField/hostingField.service.js
index e0b36fa..46ad84e 100644
--- a/src/main/webapp/scripts/components/HostingField/hostingField.service.js
+++ b/src/main/webapp/scripts/components/HostingField/hostingField.service.js
@@ -39,8 +39,8 @@
});
},
// �뾽泥�/ISP/�샇�뒪�똿 議고쉶
- getCompanyList : function (conditions) {
- return $http.post("company/getCompanyList", conditions).then(function (response) {
+ getPartnerList : function (conditions) {
+ return $http.post("company/getPartnerList", conditions).then(function (response) {
$log.debug("�뾽泥�/isp/�샇�뒪�똿 紐⑸줉 議고쉶 寃곌낵 : ", response);
return response;
});
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 1dd6f18..abdc4fb 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -36,7 +36,7 @@
$scope.fn.getIssueDepartmentList = getIssueDepartmentList; // �떞�떦�옄 -> �떞�떦遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueIspFieldList = getIssueIspFieldList; // ISP 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueHostingFieldList = getIssueHostingFieldList; // �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getCompanyList = getCompanyList; // �뾽泥�/isp/�샇�뒪�똿 紐⑸줉 議고쉶
+ $scope.fn.getPartnerList = getPartnerList; // �뾽泥�/isp/�샇�뒪�똿 紐⑸줉 議고쉶
$scope.fn.getIssueTypeList = getIssueTypeList; // �씠�뒋 �쑀�삎 紐⑸줉 議고쉶
function getUserList(query, excludeList, page, callBack) {
@@ -370,9 +370,9 @@
return deferred.promise;
}
- function getCompanyList(query, excludeList, page, callBack) {
+ function getPartnerList(query, excludeList, page, callBack) {
var conditions = {
- hostingName : query,
+ partnerName : query,
excludeIds : (function () {
var excludeIds = [];
diff --git a/src/main/webapp/views/issueType/issueTypeAdd.html b/src/main/webapp/views/issueType/issueTypeAdd.html
index ced6331..3324204 100644
--- a/src/main/webapp/views/issueType/issueTypeAdd.html
+++ b/src/main/webapp/views/issueType/issueTypeAdd.html
@@ -72,7 +72,7 @@
<div class="select3-selection__choicediv mt-10">
<span class="select3-selection__choice" ng-repeat="company in vm.form.companies">
<span>{{company.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
- <span class="select3-selection__choice__remove" ng-click="fn.removeUseCompany($index)">횞</span>
+ <span class="select3-selection__choice__remove" ng-click="fn.removeUsePartner($index)">횞</span>
</span>
</div>
</div>
diff --git a/src/main/webapp/views/issueType/issueTypeModify.html b/src/main/webapp/views/issueType/issueTypeModify.html
index 53060e2..8c8fe27 100644
--- a/src/main/webapp/views/issueType/issueTypeModify.html
+++ b/src/main/webapp/views/issueType/issueTypeModify.html
@@ -77,7 +77,7 @@
<div class="select3-selection__choicediv mt-10">
<span class="select3-selection__choice" ng-repeat="company in vm.form.companies">
<span>{{company.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
- <span class="select3-selection__choice__remove" ng-click="fn.removeUseCompany($index)">횞</span>
+ <span class="select3-selection__choice__remove" ng-click="fn.removeUsePartner($index)">횞</span>
</span>
</div>
</div>
--
Gitblit v1.8.0