From 71ae5976e7dddc5693801064e48bdd372c63f86b Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 06 12월 2021 11:18:16 +0900
Subject: [PATCH] 연관 이슈 추가
---
src/main/webapp/views/api/apiSettingColumn.html | 222 ++++++++++++++-----------------------------------------
1 files changed, 58 insertions(+), 164 deletions(-)
diff --git a/src/main/webapp/views/api/apiSettingColumn.html b/src/main/webapp/views/api/apiSettingColumn.html
index f134b54..0217992 100644
--- a/src/main/webapp/views/api/apiSettingColumn.html
+++ b/src/main/webapp/views/api/apiSettingColumn.html
@@ -1,37 +1,38 @@
<div class="row">
<div class="col-md-4">
+
<div class="form-group mb10">
- <label for="issueAddForm4" class="issue-label"> <span
- translate="issue.issueType">�씠�뒋 ���엯</span>
+ <label for="issueTypeForm" class="issue-label">
+ <span translate="issue.issueType">�씠�뒋 �쑀�삎</span>
</label>
- <select id="issueAddForm4"
+ <select id="issueTypeForm"
name="issueType"
class="form-control input-sm issue-select-label"
- ng-model="vm.form.issueTypeId"
- ng-change="fn.getIssueTypeCustomFields()"
- ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
+ ng-model="vm.issueTypeId"
+ ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.issueTypeId) }"
+ ng-change="fn.onChangeIssueType()"
required>
- <option ng-style="{ 'color' : '#353535' }" value="">�솃�럹�씠吏� 蹂�議� 媛먯�
- </option>
- <option ng-style="{ 'color' : '#353535' }" value="">寃쎌쑀吏� �깘吏�
- </option>
<option ng-repeat="issueType in vm.issueTypes"
ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
- value="{{issueType.id}}">�뿈 {{issueType.name}}
+ value="{{issueType.id}}"
+ translate="{{issueType.name}}(id:{{issueType.id}})">
</option>
</select>
</div>
+
</div>
</div>
<div class="element-box">
- <form role="form" name="issueAddForm">
+ <form role="form" name="apiSettingColumnForm">
<div class="form-group mb10">
- <label for="issueAddForm1" class="issue-label"><span translate="issue.issueTitle">�씪媛� �젣紐�</span> </label>
- <input id="issueAddForm1"
+
+ <div class="form-group mb10">
+ <label for="issueTitle" class="issue-label"><span translate="issue.issueTitle">�씪媛� �젣紐�</span> </label>
+ <input id="issueTitle"
class="form-control input-sm"
- ng-model="vm.form.title"
+ ng-model="vm.form.issueApiDefault.title"
name="title"
required
kr-input
@@ -42,51 +43,36 @@
owl-auto-focus>
</div>
<div class="row">
- <div class="col-lg-4">
- <div class="form-group mb10">
- <label class="issue-label"> <span translate="common.project">�봽濡쒖젥�듃</span> </label>
- <select id="issueAddForm6"
- name="issueType"
- class="form-control input-sm issue-select-label"
- ng-model="vm.form.issueTypeId"
- ng-change="fn.getIssueTypeCustomFields()"
- ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
- <option ng-style="{ 'color' : '#353535' }" value="">�솃�럹�씠吏� 蹂�議� 媛먯�
- </option>
- <option ng-style="{ 'color' : '#353535' }" value="">MCF
- </option>
- <option ng-repeat="issueType in vm.issueTypes"
- ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
- value="{{issueType.id}}">�뿈 {{issueType.name}}
- </option>
- </select>
- </div>
- </div>
+<!-- <div class="col-lg-4">-->
+<!-- <div class="form-group mb10">-->
+<!-- <label class="issue-label"> <span translate="common.project">�봽濡쒖젥�듃</span></label>-->
+<!-- <js-autocomplete-single data-input-name="issueType"-->
+<!-- selected-model="vm.projects"-->
+<!-- search="vm.form.projectName"-->
+<!-- source="fn.getProjectList(vm.form.projectName, vm.projects, vm.autoCompletePage.project.page, fn.getProjectListCallback)"-->
+<!-- page="vm.autoCompletePage.project.page"-->
+<!-- total-page="vm.autoCompletePage.project.totalPage"-->
+<!-- input-disabled="false"-->
+<!-- translation-texts="{ empty : 'common.emptyProject' }"-->
+<!-- extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',-->
+<!-- type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="col-lg-8 bdl1">
+ <div class="col-lg-8">
<div class="row">
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm2" class="issue-label">
+ <label for="issue-priority" class="issue-label">
<span translate="common.priority">�슦�꽑 �닚�쐞</span>
</label>
- <select id="issueAddForm2"
+ <select id="issue-priority"
name="priority"
class="form-control input-sm issue-select-label"
- ng-model="vm.form.priorityId"
+ ng-model="vm.form.issueApiDefault.priorityId"
ng-style="{ 'color' : fn.getOptionColor(vm.priorities, vm.form.priorityId) }"
required>
- <option value="" ng-style="{ 'color' : '#353535' }">
- <span >蹂댄넻</span>
- </option>
- <option value="" ng-style="{ 'color' : '#353535' }">
- <span >�넂�쓬</span>
- </option>
- <option value="" ng-style="{ 'color' : '#353535' }">
- <span >�궙�쓬</span>
- </option>
<option ng-repeat="priority in vm.priorities"
ng-style="{ 'color' : priority.color, 'font-weight': 600 }"
value="{{priority.id}}"
@@ -97,23 +83,14 @@
</div>
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm3" class="issue-label"> <span
+ <label for="issue-severity" class="issue-label"> <span
translate="common.importance">以묒슂�룄</span> </label>
- <select id="issueAddForm3"
+ <select id="issue-severity"
name="severity"
class="form-control input-sm issue-select-label"
- ng-model="vm.form.severityId"
+ ng-model="vm.form.issueApiDefault.severityId"
ng-style="{ 'color' : fn.getOptionColor(vm.severities, vm.form.severityId) }"
required>
- <option value="" ng-style="{ color : '#353535' }">
- <span>蹂댄넻</span>
- </option>
- <option value="" ng-style="{ color : '#353535' }">
- <span>�넂�쓬</span>
- </option>
- <option value="" ng-style="{ color : '#353535' }">
- <span>�궙�쓬</span>
- </option>
<option ng-repeat="severity in vm.severities"
ng-style="{ color : severity.color, 'font-weight': 600 }"
value="{{severity.id}}"
@@ -125,6 +102,21 @@
</div>
</div>
+ <div class="col-lg-8">
+ <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
+ <div class="row">
+ <label for="issue-priority" class="issue-label">
+ <span translate="common.detectingInfo">�깘吏� �젙蹂�</span>
+ </label>
+ </div>
+ <div class="row">
+
+ <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
+ <label class="issue-detail-label">�씠由�: {{::issueCustomField.customFieldVo.name}}</label>
+ <span class="issue-detail-word-break">ID: {{::issueCustomField.customFieldVo.id}}</span>
+ </div>
+ </div>
+ </div>
</div>
<div class="form-group mb10">
@@ -133,119 +125,21 @@
class="summernote"
lang="ko-KR"
summer-note-auto-focus
- ng-model="vm.form.description"
+ ng-model="vm.form.issueApiDefault.description"
data-editor="vm.summerNote.editor"
data-editable="vm.summerNote.editable"
on-image-upload="fn.imageUpload(files)"
target=".note-editable"></summernote>
</div>
- <div class="row">
- <div class="col-lg-12">
- <div class="form-group mb10">
- <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span>
- </label>
- <input id="issueAddForm5"
- tabindex="-1"
- type="text"
- readonly
- class="form-control cursor"
- placeholder="{{'issue.clickToSelectDate' | translate}}"
- ng-model="vm.form.startCompleteDateRange"
- modal-form-auto-scroll
- date-format="YYYY-MM-DD"
- parent-el="'#createdWidget'"
- date-range-picker>
- <div class="row">
- <div class="col-xs-12">
- <div id="createdWidget" class="bootstrap-datepicker"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-3">
- <div class="form-group mb10">
- <div class="form-group mb10">
- <label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
- <select id="issueAddForm"
- name="issueType"
- class="form-control input-sm issue-select-label"
- ng-model="vm.form.issueTypeId"
- ng-change="fn.getIssueTypeCustomFields()"
- ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
- <option value="" ng-style="{ 'color' : '#353535' }"><span>議곗튂�슜�뿭</span></option>
- <option value="" ng-style="{ 'color' : '#353535' }"><span>遺꾩꽍�슜�뿭</span></option>
- <option value="" ng-style="{ 'color' : '#353535' }"><span>�긽�솴�떎</span></option>
- <option ng-repeat="issueType in vm.issueTypes"
- ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
- value="{{issueType.id}}">�뿈 {{issueType.name}}
- </option>
- </select>
- </div>
- </div>
-
- </div>
- <div class="col-lg-3">
- <div class="form-group mb10">
- <div class="form-group mb10">
- <label class="issue-label"> <span>�뾽醫�</span> </label>
- <select id="issueAddFormIP"
- name="issueType"
- class="form-control input-sm issue-select-label"
- ng-model="vm.form.issueTypeId"
- ng-change="fn.getIssueTypeCustomFields()"
- ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
- <option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span>���긽 �꽑�깮</span>
- </option>
- <option ng-repeat="issueType in vm.issueTypes"
- ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
- value="{{issueType.id}}">�뿈 {{issueType.name}}
- </option>
- </select>
- </div>
-
-
- </div>
- </div>
- <div class="col-lg-3">
- <div class="form-group mb10">
- <div class="form-group mb10">
- <label class="issue-label"> <span>�룄硫붿씤</span> </label>
- <input id="issueAddForm8"
- tabindex="-1"
- type="text"
- class="form-control cursor"
- />
-
- </div>
-
-
- </div>
- </div>
- <div class="col-lg-3">
- <div class="form-group mb10">
- <div class="form-group mb10">
- <label class="issue-label"> <span>寃쎌쑀吏�IP</span> </label>
- <input id="issueAddForm*"
- tabindex="-1"
- type="text"
- class="form-control cursor"
- />
- </div>
-
-
- </div>
- </div>
- </div>
</form>
<div class="modal-footer buttons-on-right">
+ <button type="button" class="btn btn-md btn-secondary bold"
+ ng-click="fn.reset()"><span translate="common.reset">珥덇린�솕</span>
+ </button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(issueStatusAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ js-short-cut-action="(fn.formCheck(apiSettingColumnForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
ng-click="fn.formSubmit()"><span translate="common.saved">�깮�꽦</span>
</button>
</div>
--
Gitblit v1.8.0