From 862e04dc9c3e817b44a10431221fe9e135d9bd95 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 12:45:32 +0900
Subject: [PATCH] 사용자 정의 필드 날짜관련 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 40acf5e..2051ed4 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();
- }
+ }*/
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -749,6 +749,7 @@
return {
issueTypeId : $scope.vm.viewer.issueTypeVo.id
};
+
}
}
});
@@ -786,8 +787,8 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.viewer.useCompanyVo != null) {
- $scope.vm.viewer.useCompanyVo.forEach(function (partnerVo) {
+ if ($scope.vm.viewer.usePartnerVos != null) {
+ $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
@@ -886,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;
}
@@ -1041,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
};
@@ -1082,7 +1111,6 @@
}
});
}
-
}
]);
}
--
Gitblit v1.8.0