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/projectAdd.controller.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index b1ba192..664405c 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -84,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 : "",
@@ -106,7 +106,10 @@
})()
};
- 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();
@@ -118,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