From 226cb2b20e1bfe13205c1890ebf0ffb49ee37d68 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 06 1월 2022 10:59:07 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index 86a5907..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 : "",
@@ -182,7 +182,7 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.name = result.data.data.name;
$scope.vm.form.status = result.data.data.status;
- if (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;
--
Gitblit v1.8.0