From 0683ba8d7bc326bd3c819c7e156c9c656d0ebf73 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 11:52:33 +0900
Subject: [PATCH] 이슈 상세 상위 일감, 프로젝트 기간 필수값 제거
---
src/main/webapp/scripts/app/project/projectModify.controller.js | 7 ++++++-
src/main/webapp/views/issue/issueDetail.html | 1 +
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 437d530..b5be364 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -297,7 +297,8 @@
// �븯�쐞 �씠�뒋 �씠�룞(�젣紐�)
case "ISSUE_DOWN_MOVE" :
- makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.id)\">" + scope.data.title + "</span></a>";
+
+ makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data)\">" + scope.data.title + "</span></a>";
break;
// �븯�쐞 �씠�뒋 �궘�젣
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index 57cc6ce..42388f1 100644
--- a/src/main/webapp/scripts/app/project/projectModify.controller.js
+++ b/src/main/webapp/scripts/app/project/projectModify.controller.js
@@ -141,6 +141,7 @@
})(),
};
+
var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
content.startDate = startEndDateRange[0].trim();
content.endDate = startEndDateRange[1].trim();
@@ -177,7 +178,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 == "") {
+ $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;
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 4c460b8..d789ff7 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -475,6 +475,7 @@
event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
<div class="row">
+
<div class="col-sm-6">
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issuesDown"
--
Gitblit v1.8.0