From 709c9fb1f42a70da66ab9b759014b009b1c67d95 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:03:30 +0900
Subject: [PATCH] 충돌 병합
---
src/main/webapp/scripts/app/project/projectAdd.controller.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index ab7ba34..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 : "",
--
Gitblit v1.8.0