From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 02 12월 2021 21:55:28 +0900 Subject: [PATCH] 충돌 수정 --- src/main/webapp/scripts/app/issue/issueAdd.controller.js | 79 ++++++++++++++++++++++----------------- 1 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js index 5ad1972..cf89fa4 100644 --- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js +++ b/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, // �뙘�뾽 李� �떕湲� @@ -41,6 +41,7 @@ }; $scope.vm = { + partnerVos : "", form : { title : "", // �젣紐� description : "", // �궡�슜 @@ -133,14 +134,11 @@ $scope.$watch("vm.form.projects", function (newValue, oldValue) { if (angular.isDefined(newValue)) { if (newValue.length < 1) { - $scope.vm.form.departments = []; - $scope.vm.form.issueCustomFields = []; + $scope.vm.form.users = []; } - else { - if ($rootScope.isDefined($scope.vm.issueTypeId)) { - $scope.fn.getIssueTypeCustomFields(); - } - } + + // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲� + $scope.fn.getIssueTypeCustomFields(); } }); @@ -330,6 +328,7 @@ }); } return result; + } // �떞�떦�옄 autocomplete page �뾽�뜲�씠�듃�듃 @@ -579,27 +578,27 @@ }, fileFormDataName : "file" }).then(function (result) { - if (result.data.message.status === "success") { - // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬. - if ($scope.vm.infiniteAdd) { - $scope.fn.infiniteAddForm(); - } - else { - $scope.fn.cancel(); - - if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") { - $state.go("issues.list"); - } - } - - $rootScope.$broadcast("getIssueList", {}); + if (result.data.message.status === "success") { + // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬. + if ($scope.vm.infiniteAdd) { + $scope.fn.infiniteAddForm(); } else { - SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣 + $scope.fn.cancel(); + + if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") { + $state.go("issues.list"); + } } - $rootScope.spinner = false; - }); + $rootScope.$broadcast("getIssueList", {}); + } + else { + SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣 + } + + $rootScope.spinner = false; + }); } // �뙘�뾽 李� �떕湲� @@ -690,6 +689,12 @@ angular.forEach(result.data.data, function (issueTypeCustomField) { switch (issueTypeCustomField.customFieldVo.customFieldType) { case "INPUT" : + case "NUMBER" : + case "DATETIME" : + case "IP_ADDRESS" : + case "EMAIL" : + case "SITE" : + case "TEL" : issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue; break; case "SINGLE_SELECT" : @@ -763,17 +768,18 @@ } function getPartners() { - - HostingField.getPartnerList($resourceProvider.getContent( - {}, + var content = { + issueTypeId : $scope.vm.form.issueTypeId + }; + Issue.findPartners($resourceProvider.getContent( + content, $resourceProvider.getPageContent(0, 1))).then(function (result) { if (result.data.message.status === "success") { - $scope.vm.partnerVos = result.data.content; + $scope.vm.partnerVos = result.data.data; } }); } - // 理쒖큹 �떎�뻾 function startExecute() { @@ -781,7 +787,8 @@ var promises = { getIssueTypes : $scope.fn.getIssueTypes(), getPriorities : $scope.fn.getPriorities(), - getSeverities : $scope.fn.getSeverities() + getSeverities : $scope.fn.getSeverities(), + getPartners : $scope.fn.getPartners() }; $q.all(promises).then(function (results) { // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙 @@ -791,11 +798,15 @@ $scope.fn.projects.push($rootScope.workProject); $scope.fn.getProjectList($scope.vm.projectName, $scope.vm.form.projects, $scope.vm.autoCompletePage.project.page, getStartProjectListCallback); } - + // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙 + var id = $rootScope.getCurrentIssueTypeId(); + if (id != null) { + $scope.vm.form.issueTypeId = id.toString(); + } $log.debug("promises 寃곌낵 ", results); }); } $scope.fn.startExecute(); }]); - }); + }); \ No newline at end of file -- Gitblit v1.8.0