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

wyu

2021-12-28 689e17c797bf3844f7b6b6f7c086df9bd8f72a0c

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

@@ -100,15 +100,9 @@
                        return true;
                    }

                    if ($scope.vm.form.startEndDateRange == "") {
                        return true;
                    }

                    if ($scope.vm.form.managers.length < 1) {
                        return true;
                    }



                    return false;
                }
@@ -118,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 : "",
@@ -147,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,
@@ -183,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;