이슈(추가,수정)충돌 수정

이민희

2021-11-29 12ee57fe168d76d8a71993a1473dba8b20d49ab9

이슈(추가,수정)충돌 수정

 src/main/java/kr/wisestone/owl/web/controller/IssueController.java

@@ -63,7 +63,7 @@
        return this.setSuccessMessage(resJsonData);
    }

    //  이슈 조회
    //  파트너 목록 조회
    @RequestMapping(value = "/issue/findPartner", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody

 src/main/webapp/scripts/app/issue/issueAdd.controller.js

@@ -9,9 +9,9 @@
    ],
    function (app, angular) {
        app.controller('issueAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$uibModal', '$injector',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'HostingField', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
            '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $uibModal,  $injector, $controller, $tableProvider, SweetAlert, $timeout,
                      $stateParams, $q, Issue, User, AttachedFile, IssueType, HostingField, Priority, Severity, IssueTypeCustomField, $filter, $state) {
                      $stateParams, $q, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter, $state) {

                $scope.fn = {
                    cancel : cancel,    //  팝업 창 닫기
@@ -37,7 +37,7 @@
                    setIssueTypeTemplate : setIssueTypeTemplate,    //  이슈 유형 템플릿 적용하기
                    startExecute : startExecute, //  컨트롤 로딩시 처음으로 시작되는 함수
                    containsPartner : containsPartner,
                    getPartners : getPartners,
                    getPartners : getPartners
                };

                $scope.vm = {
@@ -320,8 +320,8 @@
                function containsPartner(name) {
                    var result = false;

                    if ($scope.vm.viewer.usePartnerVo != null) {
                        $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
                    if ($scope.vm.partnerVos != null) {
                        $scope.vm.partnerVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
@@ -649,22 +649,6 @@
                    return deferred.promise;
                }

                // 업체/ISP/호스팅 이름이 포함 여부 확인
                function containsPartner(name) {
                    var result = false;

                    if ($scope.vm.partnerVos != null) {
                        $scope.vm.partnerVos.forEach(function (partnerVo) {
                            if (name === partnerVo.name) {
                                result = true;
                            }
                        });
                    }
                    return result;

                }


                //  중요도 목록
                function getSeverities() {
                    var deferred = $q.defer();
@@ -776,7 +760,6 @@
                        }
                    }
                }


                function getPartners() {
                    var content = {

 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -144,7 +144,6 @@
                });

                $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {

                     $scope.vm.partnerVos = $scope.fn.getPartners();
                });

@@ -916,6 +915,7 @@
                    var promises = {
                        detail : $scope.fn.detail(),
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                    };