From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 14:23:26 +0900
Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정
---
src/main/webapp/scripts/app/project/projectModify.controller.js | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index 57cc6ce..0abec6f 100644
--- a/src/main/webapp/scripts/app/project/projectModify.controller.js
+++ b/src/main/webapp/scripts/app/project/projectModify.controller.js
@@ -112,7 +112,7 @@
var content = {
id : $scope.vm.form.id,
- parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
+ //parentProjectId : $scope.vm.projectName.length > 0 && $scope.vm.projectName == $scope.vm.form.parentProjects[0].name ? $scope.vm.form.parentProjects[0].id : null,
name : $rootScope.preventXss($scope.vm.form.name),
status : $scope.vm.form.status,
startDate : "",
@@ -141,9 +141,14 @@
})(),
};
- var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
- content.startDate = startEndDateRange[0].trim();
- content.endDate = startEndDateRange[1].trim();
+ 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();
+ }
Project.modify($resourceProvider.getContent(
content,
@@ -177,7 +182,11 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.name = result.data.data.name;
$scope.vm.form.status = result.data.data.status;
- $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
+ if (result.data.data.startDate == "" && result.data.data.endDate == "" || result.data.data.startDate == "null" && result.data.data.endDate == "null") {
+ $scope.vm.form.startEndDateRange = ""
+ } else {
+ $scope.vm.form.startEndDateRange = result.data.data.startDate + " ~ " + result.data.data.endDate;
+ }
$scope.vm.form.description = result.data.data.description;
$scope.vm.form.managers = result.data.data.projectManagerVos;
$scope.vm.form.users = result.data.data.projectUserVos;
--
Gitblit v1.8.0