From 689e17c797bf3844f7b6b6f7c086df9bd8f72a0c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 19:45:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/project/projectModify.controller.js | 14 +++++++++-----
1 files changed, 9 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 42388f1..722b8ba 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,10 +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,
--
Gitblit v1.8.0