From 5637a6a2fe52c61a46c057961f7caec99fdf2415 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 16:57:52 +0900
Subject: [PATCH] 사용자정의 필드 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3e01d52..2051ed4 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -41,6 +41,7 @@
$scope.fn.addDownIssueTableConfig = addDownIssueTableConfig; // �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
+ $scope.fn.containsPartner = containsPartner;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -462,7 +463,8 @@
// �뿰愿� �씠�뒋 �긽�꽭 議고쉶
function getRelTableConfigs() {
var content = {
- issueId : $scope.vm.viewer.id
+ issueId : $scope.vm.viewer.id,
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
};
IssueTableConfig.relationDetail($resourceProvider.getContent(
@@ -526,7 +528,8 @@
// �븯�쐞 �씠�뒋 �긽�꽭 議고쉶
function getDownTableConfigs() {
var content = {
- issueId : $scope.vm.viewer.id
+ issueId : $scope.vm.viewer.id,
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
};
IssueTableConfig.downDetail($resourceProvider.getContent(
@@ -653,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();
- }
+ }*/
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -723,7 +726,14 @@
size : "lg",
controller : 'issueAddRelationTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id
+
+ };
+ }
+ }
});
}
@@ -734,7 +744,14 @@
size : "lg",
controller : 'issueAddDownTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id
+ };
+
+ }
+ }
});
}
@@ -764,6 +781,21 @@
SweetAlert.swal($filter("translate")("issue.errorRemovableIssueStatusList"), result.data.message.message, "error"); // "�씠�룞 媛��뒫�븳 �씠�뒋 �긽�깭 紐⑸줉 議고쉶 �삤瑜�"
}
});
+ }
+
+ // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
+ function containsPartner(name) {
+ var result = false;
+
+ if ($scope.vm.viewer.usePartnerVos != null) {
+ $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
+ if (name === partnerVo.name) {
+ result = true;
+ }
+ });
+ }
+ return result;
+
}
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
@@ -855,6 +887,30 @@
case "MULTI_SELECT" :
issueTypeCustomField.useValues = [];
+ break;
+
+ case "NUMBER" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "DATETIME" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "IP_ADDRESS" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "EMAIL" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "SITE" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "TEL" :
+ issueTypeCustomField.useValues = ""
break;
}
@@ -1010,6 +1066,10 @@
resolve : {
parameter : function () {
return {
+ departmentVos : [$scope.vm.form.issues[0].departmentVos],
+ issueCompanyFields : [$scope.vm.form.issues[0].issueCompanyVos],
+ issueIspFields : [$scope.vm.form.issues[0].issueIspVos],
+ issueHostingFields : [$scope.vm.form.issues[0].issueHostingVos],
issueId : issueId,
projectId : projectId
};
@@ -1051,7 +1111,6 @@
}
});
}
-
}
]);
}
--
Gitblit v1.8.0