From 4677f35851fd0daed02d12858e71c79056969d68 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 11:02:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 2
src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 2
src/main/webapp/views/issue/issueAdd.html | 16 +++++++
src/main/webapp/custom_components/js-information/js-information.html | 6 +-
src/main/webapp/views/issue/issueModify.html | 13 ++++++
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 2
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 12 ++++++
src/main/webapp/scripts/app/issue/issueModify.controller.js | 12 ++++++
8 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/custom_components/js-information/js-information.html b/src/main/webapp/custom_components/js-information/js-information.html
index 10ca80a..2fa218e 100644
--- a/src/main/webapp/custom_components/js-information/js-information.html
+++ b/src/main/webapp/custom_components/js-information/js-information.html
@@ -1,6 +1,6 @@
-<div class="floated-chat-btn" ui-sref="support.support" ng-if="$root.showaskbtn()">
- <i class="os-icon os-icon-mail-07"></i><span translate="inquiry.toInquiry">臾몄쓽�븯湲�</span>
-</div>
+<!--<div class="floated-chat-btn" ui-sref="support.support" ng-if="$root.showaskbtn()">-->
+<!-- <i class="os-icon os-icon-mail-07"></i><span translate="inquiry.toInquiry">臾몄쓽�븯湲�</span>-->
+<!--</div>-->
<!--
<div class="floated-chat-w active" ng-show="$root.information">
<div class="floated-chat-i">
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 13089fa..5dbac8d 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -120,6 +120,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){
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 8d58039..9c5ef09 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -156,7 +156,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 8;
angular.forEach(result, function (customField) {
$scope.vm.issueDownTableConfigs.push({
name : customField.name,
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index 1634b8f..e959d60 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -152,7 +152,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 6;
+ var count = 7;
angular.forEach(result, function (customField) {
$scope.vm.issueRelTableConfigs.push({
name : customField.name,
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index a14c502..1ddebb6 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -172,7 +172,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 8;
+ var count = 10;
angular.forEach(result, function (customField) {
$scope.vm.issueTableConfigs.push({
name : customField.name,
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index b0c06ab..8c15c9c 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -126,6 +126,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}));
// �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦遺��꽌 珥덇린�솕
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 6da99cd..2ba70f3 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -211,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">
@@ -229,7 +243,7 @@
<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">
<!-- 湲곕낯 �엯�젰 -->
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index d5a8695..f356cc6 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -211,6 +211,19 @@
</div>
</div>
</div>
+
+ <div class="row">
+ <div class="col-sm-4">
+ <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">
--
Gitblit v1.8.0