From cd56d401c5233f24790a5be8ba4075a97ab80fe3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 19:20:08 +0900
Subject: [PATCH] 상위 프로젝트는 추가 못하도록 수정
---
src/main/webapp/scripts/app/project/projectAdd.controller.js | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index 25711d7..664405c 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -16,6 +16,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
removeUsr : removeUsr, // �씪諛� �궗�슜�옄 �젣嫄�
+ removeDepartment : removeDepartment // 遺��꽌 �젣嫄�
};
$scope.vm = {
@@ -33,6 +34,7 @@
id : $rootScope.user.id
}], // 愿�由ъ옄
users : [], // �씪諛� �궗�슜�옄
+ departments : []
},
userName : "", // �씪諛� �궗�슜�옄 �씠由� 寃��깋
projectName : "", // �긽�쐞 �봽濡쒖젥�듃 �씠由� 寃��깋
@@ -62,12 +64,13 @@
$scope.vm.form.users.splice(index, 1);
}
+ // �떞�떦遺��꽌 �궘�젣
+ function removeDepartment(index) {
+ $scope.vm.form.departments.splice(index, 1);
+ }
+
function formCheck(formInvalid) {
if (formInvalid) {
- return true;
- }
-
- if (!$rootScope.isDefined($scope.vm.form.startEndDateRange)) {
return true;
}
@@ -81,7 +84,7 @@
name : $rootScope.preventXss($scope.vm.form.name),
projectKey : $scope.vm.form.projectKey,
projectType : $scope.vm.form.projectType,
- parentProjectId : $scope.vm.projectName != null && $scope.vm.projectName.length > 0 ? $scope.vm.form.projects[0].id : null,
+ //parentProjectId : $scope.vm.projectName != null && $scope.vm.projectName.length > 0 ? $scope.vm.form.projects[0].id : null,
status : $scope.vm.form.status,
startDate : "",
endDate : "",
@@ -93,17 +96,20 @@
});
return managerIds;
})(),
- //遺��꽌id 異붽� �븘�슂
+ // 遺��꽌 id 異붽� �븘�슂
departmentIds : (function () {
var departmentIds = [];
- angular.forEach($scope.vm.form.users, function (user) {
- departmentIds.push(user.id);
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
});
return departmentIds;
})()
};
- if ($rootScope.isDefined($scope.vm.form.startEndDateRange)) {
+ if ($scope.vm.form.startEndDateRange === null || $scope.vm.form.startEndDateRange === "") {
+ content.startDate = "";
+ content.endDate = "";
+ } else {
var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
content.startDate = startEndDateRange[0].trim();
content.endDate = startEndDateRange[1].trim();
@@ -115,7 +121,7 @@
if (result.data.message.status === "success") {
$scope.fn.cancel();
- $rootScope.user.lastProjectId = result.data.data.id;
+ // $rootScope.user.lastProjectId = result.data.data.id;
// 紐⑸줉 �솕硫� 媛깆떊
$rootScope.$broadcast("getProjectList", {});
}
--
Gitblit v1.8.0