From a93ef198d8ac95975560d71e53aa1aa59d8c5125 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 15:53:24 +0900
Subject: [PATCH] 사용자 정의 필드 관련 오류 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 72 +++++++++++++----------------------
1 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 2051ed4..fe209d8 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -42,6 +42,7 @@
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
+ $scope.fn.onActivate = onActivate;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -85,6 +86,7 @@
$scope.vm.issueName = ""; // �꽑�깮�맂 �뿰愿� �씪媛� �씠由�
$scope.vm.issueId = ""; //
+ $scope.vm.issueTypeId = "";
$scope.vm.autoCompletePage = {
issue : {
page : 0,
@@ -110,8 +112,13 @@
function changeDetailView(issue) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- // $rootScope.$broadcast("makeIssueSearch", issue);
+ //$rootScope.$broadcast("makeIssueSearch",issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
+ $scope.fn.onActivate();
+ }
+
+ function onActivate() {
+ window.scroll(0,240);
}
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -279,14 +286,6 @@
.setDAlign("text-center")
.setDName("modifyDate"));
break;
- // default :"ISSUE_RELATION_DELETE" // �뿰愿� �궘�젣
- // $scope.vm.relTableConfigs.push($tableProvider.config()
- // .setHName("issue.downIssueTitle")
- // .setDType("renderer")
- // .setHWidth("bold" + issueTableConfig.width)
- // .setHSort(false)
- // .setDRenderer("ISSUE_RELATION_DELETE"));
- // break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
@@ -581,9 +580,6 @@
});
}
-
-
-
// �뿰愿� �씠�뒋 異붽�
function addRelationIssue() {
if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
@@ -656,6 +652,7 @@
$scope.vm.editor.issueStatus = false;
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
+ $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
/*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
$scope.$apply();
}*/
@@ -807,7 +804,7 @@
$scope.fn.getDownTableConfigs();
Issue.detail($resourceProvider.getContent(
- {id : $scope.vm.viewer.id, deep : "02"},
+ {id : $scope.vm.viewer.id, deep : "02", customFields : $scope.vm.customFields},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
@@ -834,16 +831,19 @@
$scope.vm.form.issuesDown.push(result.data.data);
// �뿰愿� �씠�뒋 諛섎났臾�
- angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
- issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
- $scope.vm.form.issues.push(issueRelationVo.issueRelation);
- });
+ if (result.data.data.issueRelationVos !== null) {
+ angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
+ issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
+ $scope.vm.form.issues.push(issueRelationVo.issueRelation);
+ });
+ }
// �븯�쐞 �씠�뒋 諛섎ぉ臾�
- angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
- $scope.vm.form.issuesDown.push(issueDownVo.issue);
- });
-
+ if (result.data.data.issueDownVos !== null){
+ angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
+ $scope.vm.form.issuesDown.push(issueDownVo.issue);
+ });
+ }
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
}
@@ -882,35 +882,17 @@
switch (issueTypeCustomField.customFieldVo.customFieldType) {
case "INPUT" :
case "SINGLE_SELECT" :
+ case "NUMBER" :
+ case "DATETIME" :
+ case "IP_ADDRESS" :
+ case "EMAIL" :
+ case "SITE" :
+ case "TEL" :
issueTypeCustomField.useValues = "";
break;
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;
}
--
Gitblit v1.8.0