From 107ab8e67d089738ad8b3a1ff0efc96680a13cf6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 14:29:47 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueModify.html | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index e737e65..5ff5c92 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -219,7 +219,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">
@@ -228,7 +228,7 @@
</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>
@@ -347,13 +347,14 @@
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<ng-dropdown-multiselect class="multiSelect cursor"
- name="multiSelect"
- ng-required="issueCustomField.customFieldVo.requiredData == 'Y'"
data-input-name=""
modal-form-auto-scroll
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <input class="form-control input-sm issue-select-label"
+ type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
ng-if="issueAddForm.multiSelect.$error.required"
@@ -440,6 +441,20 @@
<div ng-show="issueAddForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="companyFieldUrlAddForm"
+ name="companyUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.companyUrl"
+ maxlength="200">
</div>
</div>
<div class="col-lg-4">
@@ -550,6 +565,20 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
+ <label for="ispFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="ispFieldUrlAddForm"
+ name="ispUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.ispUrl"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
<label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.memo">鍮꾧퀬</span></label>
<input id="ispFieldDescAddForm"
name="ispMemo"
@@ -656,6 +685,20 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
+ <label for="hostingFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="hostingFieldUrlAddForm"
+ name="hostingUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.hostingUrl"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
<label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.memo">鍮꾧퀬</span></label>
<input id="hostingFieldDescAdd"
name="hostingMemo"
--
Gitblit v1.8.0