From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 12415a7..1528f46 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -144,8 +144,7 @@
});
$scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
-
- $scope.vm.partnerVos = $scope.fn.getPartners();
+ $scope.vm.partnerVos = $scope.fn.getPartners();
});
@@ -170,9 +169,9 @@
}
// �떞�떦�옄 �궘�젣
- function removeManager(index) {
- $scope.vm.form.users.splice(index, 1);
- }
+ function removeManager(index) {
+ $scope.vm.form.users.splice(index, 1);
+ }
// �떞�떦遺��꽌 �궘�젣
function removeDepartment(index) {
@@ -916,6 +915,7 @@
var promises = {
detail : $scope.fn.detail(),
getIssueTypes : $scope.fn.getIssueTypes(),
+ getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
getPartners : $scope.fn.getPartners()
};
@@ -927,4 +927,4 @@
$scope.fn.startExecute();
}]);
- });
+ });
\ No newline at end of file
--
Gitblit v1.8.0