From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5fa436e..cf89fa4 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -689,6 +689,12 @@
angular.forEach(result.data.data, function (issueTypeCustomField) {
switch (issueTypeCustomField.customFieldVo.customFieldType) {
case "INPUT" :
+ case "NUMBER" :
+ case "DATETIME" :
+ case "IP_ADDRESS" :
+ case "EMAIL" :
+ case "SITE" :
+ case "TEL" :
issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
break;
case "SINGLE_SELECT" :
@@ -705,30 +711,6 @@
});
}
});
- break;
-
- case "NUMBER" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
- break;
-
- case "DATETIME" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
- break;
-
- case "IP_ADDRESS" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
- break;
-
- case "EMAIL" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
- break;
-
- case "SITE" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
- break;
-
- case "TEL" :
- issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
break;
}
@@ -816,7 +798,11 @@
$scope.fn.projects.push($rootScope.workProject);
$scope.fn.getProjectList($scope.vm.projectName, $scope.vm.form.projects, $scope.vm.autoCompletePage.project.page, getStartProjectListCallback);
}
-
+ // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙
+ var id = $rootScope.getCurrentIssueTypeId();
+ if (id != null) {
+ $scope.vm.form.issueTypeId = id.toString();
+ }
$log.debug("promises 寃곌낵 ", results);
});
}
--
Gitblit v1.8.0