From 12a790240ef0301f839a55e1846ed0c5a32dffee Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 화, 07 12월 2021 13:29:34 +0900 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/webapp/views/issue/issueAdd.html | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html index f5dc710..2ba70f3 100644 --- a/src/main/webapp/views/issue/issueAdd.html +++ b/src/main/webapp/views/issue/issueAdd.html @@ -59,7 +59,8 @@ ng-model="vm.form.issueTypeId" ng-change="fn.getIssueTypeCustomFields()" ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }" - required> + required + disabled> <option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span translate="common.selectTarget">���긽 �꽑�깮</span> </option> @@ -210,6 +211,20 @@ </div> </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"> @@ -217,7 +232,7 @@ </div> </div> - <div class="col-lg-8"> + <div class="col-lg-12"> <div class="row"> <div class="col-md-12"> <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1"> @@ -226,9 +241,9 @@ </div> </div> - <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields"> + <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields"> <div class="form-group mgb5"> - <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label> + <label class="issue-label">{{issueCustomField.customFieldVo.name}}<code ng-if="" class="highlighter-rouge"> *</code></label> <div ng-switch on="issueCustomField.customFieldVo.customFieldType"> <!-- 湲곕낯 �엯�젰 --> @@ -314,7 +329,9 @@ </div> </div> </div> + <hr> + <div ng-show="fn.containsPartner('�뾽泥�')" class="row"> <div class="col-lg-8 fontcolor_green"> <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span> -- Gitblit v1.8.0