From 35f7c70c387989ff734338527008ca0ff498cffe Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 12 1월 2022 15:20:50 +0900 Subject: [PATCH] "전체이슈" 일 경우 이슈 상세페이지에서 연관이슈 및 하위이슈 새로 추가 시 오류 수정 --- src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 2 +- src/main/webapp/scripts/app/issue/issueList.controller.js | 6 ++++-- src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 4 +++- src/main/webapp/views/issue/issueDetail.html | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js index b066d43..ee5c8c4 100644 --- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js @@ -52,7 +52,7 @@ issueCompanyFields : [], // �뾽泥댁젙蹂� issueIspFields : [], // ISP �젙蹂� issueHostingFields : [], // �샇�뒪�똿�젙蹂� - issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒 + issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒 priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒 severityId : "", // 以묒슂�룄 �븘�씠�뵒 users : [], // �떞�떦�옄 @@ -956,6 +956,8 @@ var id = $rootScope.getCurrentIssueTypeId(); if (id != null) { $scope.vm.form.issueTypeId = id.toString(); + } else { + $scope.vm.form.issueTypeId = parameter.issueTypeId; } $log.debug("promises 寃곌낵 ", results); }); diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js index a99d138..48b68d1 100644 --- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js @@ -52,7 +52,7 @@ issueCompanyFields : [], // �뾽泥댁젙蹂� issueIspFields : [], // ISP �젙蹂� issueHostingFields : [], // �샇�뒪�똿�젙蹂� - issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒 + issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒 priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒 severityId : "", // 以묒슂�룄 �븘�씠�뵒 users : [], // �떞�떦�옄 diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js index 15c8ac4..1dc4a81 100644 --- a/src/main/webapp/scripts/app/issue/issueList.controller.js +++ b/src/main/webapp/scripts/app/issue/issueList.controller.js @@ -854,7 +854,7 @@ }); } - function addRelationIssueForm(id) { + function addRelationIssueForm(id, issueTypeId) { $uibModal.open({ templateUrl : 'views/issue/issueAddRelation.html', size : "lg", @@ -864,13 +864,14 @@ parameter : function () { return { id : id, + issueTypeId : issueTypeId }; } } }); } - function addDownIssueForm(id) { + function addDownIssueForm(id, issueTypeId) { $uibModal.open({ templateUrl : 'views/issue/issueAddDown.html', size : "lg", @@ -880,6 +881,7 @@ parameter : function () { return { id : id, + issueTypeId : issueTypeId }; } } diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index 63b974f..b298891 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -557,7 +557,7 @@ ng-click="fn.addRelationIssue()" translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button> <button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1" - ng-click="fn.addRelationIssueForm(vm.viewer.id)"> + ng-click="fn.addRelationIssueForm(vm.viewer.id, vm.issueTypeId)"> <i class="os-icon os-icon-plus"><span></span></i> </button> </div> @@ -647,7 +647,7 @@ ng-click="fn.addDownIssue()" translate="issue.addDownIssue">異붽�</button> <button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1" - ng-click="fn.addDownIssueForm(vm.viewer.id)"> + ng-click="fn.addDownIssueForm(vm.viewer.id, vm.issueTypeId)"> <i class="os-icon os-icon-plus"><span></span></i> </button> </div> -- Gitblit v1.8.0