From 0c8d91d705c987f07fd498b1406dcca08a237238 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 07 12월 2021 14:19:00 +0900 Subject: [PATCH] 연관이슈 추가 기능 --- src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 14 +++++++++++++- src/main/webapp/views/issue/issueAdd.html | 13 ------------- src/main/webapp/views/issue/issueAddRelation.html | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js index 0b36fe8..e8a2959 100644 --- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js @@ -127,6 +127,18 @@ fileTableConfigs : [], // �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉� }; + // �뿰愿� �씪媛� 愿��젴 + $scope.vm.relationIssueTypes = + [ + { id: 0, name: $filter("translate")("issue.relationIssueType1") }, + { id: 1, name: $filter("translate")("issue.relationIssueType2") }, + { id: 2, name: $filter("translate")("issue.relationIssueType3") }, + { id: 3, name: $filter("translate")("issue.relationIssueType4") }, + { id: 4, name: $filter("translate")("issue.relationIssueType5") }, + { id: 5, name: $filter("translate")("issue.relationIssueType6") } + ]; + $scope.vm.relationIssueType = $scope.vm.relationIssueTypes[0]; + angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); function getStartProjectListCallback(result){ @@ -652,7 +664,7 @@ var contents = { //relationIssueType : $scope.vm.form.relationIssueTypeId, - relationIssueType : 0, //ToDo:�씪�떒 湲곕낯媛믪쑝濡� 異붽��릺�룄濡� �뿰愿��씠�뒋 留뚮뱾湲� �럹�씠吏��뿉�꽌 �꽑�깮 �븷 �닔 �엳�룄濡� �닔�젙 �븘�슂 + relationIssueType : $scope.vm.relationIssueType.id, // issueId : $rootScope.currentDetailIssueId, issueId : parameter.id, relationIssueId : relId, diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html index 2ba70f3..d34b3c0 100644 --- a/src/main/webapp/views/issue/issueAdd.html +++ b/src/main/webapp/views/issue/issueAdd.html @@ -212,19 +212,6 @@ </div> </div> - <div class="row"> - <div class="col-sm-4"> - <label class="issue-label" translate="issue.relationIssueType">�뿰愿� �씠�뒋 援щ텇</label> - <select id="relationIssueType" - name="relationIssueType" - class="form-control input-sm" - ng-options="option.name for option in vm.relationIssueTypes track by option.id" - ng-model="vm.relationIssueType" - required> - </select> - </div> - </div> - <hr> <div class="row"> <div class="col-lg-4 fontcolor_green"> diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html index 825e9b5..c5a1262 100644 --- a/src/main/webapp/views/issue/issueAddRelation.html +++ b/src/main/webapp/views/issue/issueAddRelation.html @@ -29,17 +29,17 @@ </small> </div> -<!-- <div class="form-group mb10 col-sm-4">--> -<!-- <label class="issue-label"><span class="highlighter-rouge">�뿰愿� �씠�뒋 援щ텇</span></label>--> -<!-- <select id="relationIssueType"--> -<!-- name="relationIssueType"--> -<!-- class="form-control input-sm"--> -<!-- ng-options="option.name for option in vm.relationIssueTypes track by option.id"--> -<!-- ng-model="vm.relationIssueType"--> -<!-- required>--> -<!-- </select>--> + <div class="form-group mb10 col-sm-4"> + <label class="issue-label"><span class="highlighter-rouge">�뿰愿� �씠�뒋 援щ텇</span></label> + <select id="relationIssueType" + name="relationIssueType" + class="form-control input-sm" + ng-options="option.name for option in vm.relationIssueTypes track by option.id" + ng-model="vm.relationIssueType" + required> + </select> -<!-- </div>--> + </div> <div class="row"> <div class="col-lg-4"> -- Gitblit v1.8.0