From 5c686b4f8f380ff6aacb805bdf03d5b6a8d91b52 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 03 12월 2021 14:50:22 +0900
Subject: [PATCH] 사용자정의필드 useFlag 조건 추가
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 1985f6c..7ec3cdf 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -578,27 +578,27 @@
},
fileFormDataName : "file"
}).then(function (result) {
- if (result.data.message.status === "success") {
- // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
- if ($scope.vm.infiniteAdd) {
- $scope.fn.infiniteAddForm();
- }
- else {
- $scope.fn.cancel();
-
- if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
- }
- }
-
- $rootScope.$broadcast("getIssueList", {});
+ if (result.data.message.status === "success") {
+ // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
+ if ($scope.vm.infiniteAdd) {
+ $scope.fn.infiniteAddForm();
}
else {
- SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $scope.fn.cancel();
+
+ if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+ $state.go("issues.list");
+ }
}
- $rootScope.spinner = false;
- });
+ $rootScope.$broadcast("getIssueList", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ }
+
+ $rootScope.spinner = false;
+ });
}
// �뙘�뾽 李� �떕湲�
@@ -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" :
@@ -762,8 +768,11 @@
}
function getPartners() {
+ if($scope.vm.form.issueTypeId === ""){
+ $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ }
var content = {
- issueTypeId : $scope.vm.form.issueTypeId
+ issueTypeId : $scope.vm.form.issueTypeId,
};
Issue.findPartners($resourceProvider.getContent(
content,
@@ -792,11 +801,15 @@
$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);
});
}
$scope.fn.startExecute();
}]);
- });
+ });
\ No newline at end of file
--
Gitblit v1.8.0