From b6b1913970a18f0a1f09e795ceec02a4a3605295 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 14:03:40 +0900
Subject: [PATCH] - 이슈 트리 목록에서는 하위이슈 숨기기 버튼 숨기기 - 하위이슈의 상태가 종료가 아닐 경우에 상위이슈의 상태를 종료로 변경을 못하도록 막는 기능
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 8c15c9c..65cf2c2 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -75,6 +75,7 @@
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
+ companyUrl : "", // �뾽泥� url
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispId : -1,
ispName : "", // ISP 紐�
@@ -82,6 +83,7 @@
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
+ ispUrl : "", // url
ispMemo : "", // ISP 鍮꾧퀬
hostingId : -1,
hostingName : "", // �샇�뒪�똿紐� 寃��깋
@@ -89,6 +91,7 @@
hostingCode : "", // �샇�뒪�똿 肄붾뱶
hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+ hostingUrl : "", // url
hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
// user : {
@@ -368,12 +371,34 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
+ var ispFieldVo = result[0].ispFieldVo;
+ var hostingFieldVo = result[0].hostingFieldVo;
+
$scope.vm.companyId = result[0].id;
$scope.vm.companyName = result[0].name;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
+
+ $scope.vm.ispId = ispFieldVo.id;
+ $scope.vm.ispName = ispFieldVo.name;
+ $scope.vm.ispCode = ispFieldVo.code;
+ $scope.vm.ispManager = ispFieldVo.manager;
+ $scope.vm.ispTel = ispFieldVo.tel;
+ $scope.vm.ispEmail = ispFieldVo.email;
+ $scope.vm.ispUrl = ispFieldVo.url;
+ $scope.vm.ispMemo = ispFieldVo.memo;
+
+ $scope.vm.hostingId = hostingFieldVo.id;
+ $scope.vm.hostingName = hostingFieldVo.name;
+ $scope.vm.hostingCode = hostingFieldVo.code;
+ $scope.vm.hostingManager = hostingFieldVo.manager;
+ $scope.vm.hostingTel = hostingFieldVo.tel;
+ $scope.vm.hostingEmail = hostingFieldVo.email;
+ $scope.vm.hostingUrl = hostingFieldVo.url;
+ $scope.vm.hostingMemo = hostingFieldVo.memo;
});
@@ -385,6 +410,7 @@
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
$scope.vm.ispMemo = result[0].memo;
});
@@ -396,6 +422,7 @@
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
$scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
$scope.vm.hostingMemo = result[0].memo;
});
@@ -410,18 +437,21 @@
companyManager : $scope.vm.companyManager,
companyTel : $scope.vm.companyTel,
companyEmail :$scope.vm.companyEmail,
+ companyUrl : $scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
ispTel : $scope.vm.ispTel,
ispEmail : $scope.vm.ispEmail,
+ ispUrl : $scope.vm.ispUrl,
ispMemo : $scope.vm.ispMemo,
hostingName : $scope.vm.hostingName,
hostingCode : $scope.vm.hostingCode,
hostingManager : $scope.vm.hostingManager,
hostingTel : $scope.vm.hostingTel,
hostingEmail : $scope.vm.hostingEmail,
+ hostingUrl : $scope.vm.hostingUrl,
hostingMemo : $scope.vm.hostingMemo,
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
@@ -462,7 +492,7 @@
hostingId : (function () {
var hostingId = -1;
- if ($scope.vm.form.issueHostingFields.length > 0) {
+ if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
}
@@ -512,6 +542,7 @@
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
+ url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo
});
}
@@ -532,6 +563,7 @@
manager : $scope.vm.ispManager,
tel : $scope.vm.ispTel,
email :$scope.vm.ispEmail,
+ url :$scope.vm.ispUrl,
memo : $scope.vm.ispMemo
});
@@ -554,6 +586,7 @@
manager : $scope.vm.hostingManager,
tel : $scope.vm.hostingTel,
email :$scope.vm.hostingEmail,
+ url :$scope.vm.hostingUrl,
memo : $scope.vm.hostingMemo
});
}
@@ -824,6 +857,7 @@
$scope.vm.companyManager = issueCompanyFieldValue.manager;
$scope.vm.companyTel = issueCompanyFieldValue.tel;
$scope.vm.companyEmail = issueCompanyFieldValue.email;
+ $scope.vm.companyUrl = issueCompanyFieldValue.url;
$scope.vm.companyMemo = issueCompanyFieldValue.memo;
}
if (result.data.data.issueIspVos != null && result.data.data.issueIspVos.length > 0) {
@@ -835,6 +869,7 @@
$scope.vm.ispManager = issueIspFieldValue.manager;
$scope.vm.ispTel = issueIspFieldValue.tel;
$scope.vm.ispEmail = issueIspFieldValue.email;
+ $scope.vm.ispUrl = issueIspFieldValue.url;
$scope.vm.ispMemo = issueIspFieldValue.memo;
}
@@ -847,6 +882,7 @@
$scope.vm.hostingManager = issueHostingFieldValue.manager;
$scope.vm.hostingTel = issueHostingFieldValue.tel;
$scope.vm.hostingEmail = issueHostingFieldValue.email;
+ $scope.vm.hostingUrl = issueHostingFieldValue.url;
$scope.vm.hostingMemo = issueHostingFieldValue.memo;
}
--
Gitblit v1.8.0