Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

jhjang

2021-12-09 ab7e04765622b7ef31bb891a91e89abcf203c31d

 src/main/webapp/scripts/app/project/projectModify.controller.js

@@ -141,9 +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,
@@ -177,7 +182,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;