From 2b5c6c4c2b6d54ec4a2f2ba57561d8912065e0ee Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 15:48:28 +0900
Subject: [PATCH] - 전체프로젝트가 선택 된 상태에서 ISSUE TYPE LIST 선택 시에도 전체프로젝트로 유지되도록 수정 - 전체 프로젝트 또는 전체 이슈 일 경우에도 '이슈 만들기' 버튼 보이도록 수정(만들기 폼에서 프로젝트,이슈유형 수정가능하도록)
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 04c9f2a..b8ee166 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -60,7 +60,7 @@
issueCompanyFields : [], // �뾽泥댁젙蹂�
issueIspFields : [], // ISP �젙蹂�
issueHostingFields : [], // �샇�뒪�똿�젙蹂�
- issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
issueStatusId : "", // �씠�뒋 �긽�깭 �븘�씠�뵒
@@ -435,6 +435,22 @@
return false;
}
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
var ispFieldVo = result[0].ispFieldVo;
@@ -477,6 +493,7 @@
$scope.vm.hostingMemo = "";
if (ispFieldVo != null){
+ $scope.vm.form.issueIspFields[0] = angular.copy(ispFieldVo);
$scope.vm.ispId = ispFieldVo.id;
$scope.vm.ispName = ispFieldVo.name;
$scope.vm.ispCode = ispFieldVo.code;
@@ -487,6 +504,7 @@
$scope.vm.ispMemo = ispFieldVo.memo;
}
if (hostingFieldVo != null){
+ $scope.vm.form.issueHostingFields[0] = angular.copy(hostingFieldVo);
$scope.vm.hostingId = hostingFieldVo.id;
$scope.vm.hostingName = hostingFieldVo.name;
$scope.vm.hostingCode = hostingFieldVo.code;
@@ -677,7 +695,11 @@
issueCompanyFields : (function () {
var issueCompanyFields = [];
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
+
var companyField = $scope.vm.form.issueCompanyFields[0];
+ if (companyField.name !== $scope.vm.companyName) { //�궗�슜�옄媛� 吏곸젒 �뾽泥� 異붽� �븷 寃쎌슦
+ return issueCompanyFields;
+ }
issueCompanyFields.push({
id : companyField.id,
@@ -688,11 +710,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
@@ -704,6 +726,11 @@
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
&& $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
|| $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
+
+ var ispField = $scope.vm.form.issueIspFields[0];
+ if (ispField.name !== $scope.vm.ispName) { //�궗�슜�옄媛� 吏곸젒 ISP 異붽� �븷 寃쎌슦
+ return issueIspFields;
+ }
issueIspFields.push({
ispId : $scope.vm.ispId,
@@ -726,6 +753,11 @@
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
&& $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
|| $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
+
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+ if (hostingField.name !== $scope.vm.hostingName) { //�궗�슜�옄媛� 吏곸젒 �샇�뒪�똿 異붽� �븷 寃쎌슦
+ return issueHostingFields;
+ }
issueHostingFields.push({
hostingId : $scope.vm.hostingId,
@@ -1108,7 +1140,9 @@
function getPartners() {
if($scope.vm.form.issueTypeId === ""){
- $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ if ($rootScope.issueTypeMenu != null) {
+ $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ }
}
var content = {
issueTypeId : $scope.vm.form.issueTypeId,
--
Gitblit v1.8.0