From 4ca3a63a192a8a2a03f287ee406780b78f359b89 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 14:03:39 +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 | 53 +++++++---
src/main/webapp/views/issue/issueAddRelationTableConfig.html | 11 +
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 2
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 88 ++++++++++-------
src/main/webapp/views/issue/issueAddDownTableConfig.html | 10 +
src/main/webapp/views/issue/issueDetail.html | 3
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 109 ++++++++++++---------
7 files changed, 166 insertions(+), 110 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 9c5ef09..39c5ff4 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -24,48 +24,61 @@
$scope.vm = {
issueId : "",
issueDownTableConfigs : [{
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
+ name : $filter("translate")("issue.downIssueTitle"), // �븯�쐞 �씠�뒋 �젣紐�
+ key : "DOWN_ISSUE_TITLE",
width : "width-80-p",
- position : 1,
- display : false
- }, {
- name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
- position : 2,
- display : false
- }, {
- name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
- width : "width-100-p",
- position : 3,
- display : false
- }, {
- name : $filter("translate")("common.register"), // �벑濡앹옄
- key : "REGISTER",
- width : "width-100-p",
- position : 4,
- display : false
- }, {
- name : $filter("translate")("common.period"), // 湲곌컙
- key : "PERIOD",
- width : "width-140-p",
- position : 5,
- display : false
- }, {
- name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
- key : "MODIFY_DATE",
- width : "width-100-p",
- position : 6,
- display : false
+ position : 0,
+ display : true,
+ checkboxShow : false
}, {
name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭
key : "ISSUE_DOWN_STATUS_TYPE",
+ width : "width-50-p",
+ position : 1,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
+ key : "DOWN_PRIORITY",
+ width : "width-50-p",
+ position : 2,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.importance"), // 以묒슂�룄
+ key : "DOWN_SEVERITY",
+ width : "width-50-p",
+ position : 3,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "DOWN_ASSIGNEE_TEAM",
+ width : "width-50-p",
+ position : 4,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.register"), // �벑濡앹옄
+ key : "DOWN_REGISTER",
+ width : "width-50-p",
+ position : 5,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.period"), // 湲곌컙
+ key : "DOWN_PERIOD",
+ width : "width-100-p",
+ position : 6,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
+ key : "DOWN_MODIFY_DATE",
width : "width-100-p",
position : 7,
- display : false
- },{
+ display : false,
+ checkboxShow : true
}]
};
@@ -137,7 +150,7 @@
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
+ //delValue : $scope.vm.issueDownTableConfigs.splice(8,1),
issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
@@ -163,6 +176,7 @@
key : "CUSTOM_FIELD_" + customField.id,
width : "width-100-p",
display : false,
+ checkboxShow : true,
position : count
});
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index e959d60..9b232ae 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -25,41 +25,61 @@
$scope.vm = {
issueTypeId: "",
issueRelTableConfigs : [{
+ name : $filter("translate")("issue.relationIssueType"), // �뿰愿� �씠�뒋 援щ텇
+ key : "RELATION_ISSUE_TYPE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
+ name : $filter("translate")("issue.relationIssueTitle"), // �뿰愿� �씠�뒋 �젣紐�
+ key : "RELATION_ISSUE_TITLE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-100-p",
+ key : "RELATION_PRIORITY",
+ width : "width-50-p",
position : 1,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-100-p",
+ key : "RELATION_SEVERITY",
+ width : "width-50-p",
position : 2,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
+ key : "RELATION_ASSIGNEE_TEAM",
width : "width-50-p",
position : 3,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
- key : "REGISTER",
+ key : "RELATION_REGISTER",
width : "width-50-p",
position : 4,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.period"), // 湲곌컙
- key : "PERIOD",
+ key : "RELATION_PERIOD",
width : "width-100-p",
position : 5,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
- key : "MODIFY_DATE",
+ key : "RELATION_MODIFY_DATE",
width : "width-100-p",
position : 6,
- display : false
+ display : false,
+ checkboxShow : true
}, {
}]
};
@@ -134,7 +154,7 @@
var content = {
issueId : $rootScope.currentDetailIssueId,
issueTypeId : $rootScope.getCurrentIssueTypeId(),
- delValue : $scope.vm.issueRelTableConfigs.splice(6,1),
+ delValue : $scope.vm.issueRelTableConfigs.splice(8,1),
issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
@@ -152,13 +172,14 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 8;
angular.forEach(result, function (customField) {
$scope.vm.issueRelTableConfigs.push({
name : customField.name,
key : "CUSTOM_FIELD_" + customField.id,
width : "width-100-p",
display : false,
+ checkboxShow : true,
position : count
});
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 674cceb..3423551 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -244,73 +244,80 @@
// �뿰愿� �씠�뒋 而щ읆
switch(Rel_issueTableConfig.key) {
- // �뿰愿� �씠�뒋 援щ텇
- case "RELATION_ISSUE_TYPE" :
+ case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
+ .setDName("relationIssueType")
.setDType("renderer")
- .setHWidth("width-30 bold")
- .setHSort(false)
+ .setDAlign("text-center")
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_TYPE"))
+ /*.setHWidth("width-30 bold")*/
+ /*.setHSort(false)*/
break;
- // �뿰愿� �씠�뒋 �젣紐�
- case "RELATION_ISSUE_TITLE" :
+ case "RELATION_ISSUE_TITLE" : // �뿰愿� �씠�뒋 �젣紐�
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueTitle")
+ .setDName("relationIssueTitle")
.setDType("renderer")
- .setHWidth("width-60 bold")
- .setHSort(false)
+ .setDAlign("text-center")
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_MOVE"))
+ /*.setHWidth("width-60 bold")*/
+ /*.setHSort(true)*/
break;
- case "PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+ case "RELATION_PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("relPriority")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
+ case "RELATION_SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("relSeverity")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_SEVERITY"));
break;
- case "ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
+ case "RELATION_ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("relAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
+ case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("relRegister")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
- case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
+ case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("relPeriod")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DUE_DATE"));
break;
- case "MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
+ case "RELATION_MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
- .setDName("modifyDate"));
+ .setDName("relModifyDate"));
break;
}
@@ -324,6 +331,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("relCustomFieldName" + [count])
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -341,10 +349,10 @@
// �븯�쐞 �씠�뒋 而щ읆
switch(Down_issueTableConfig.key) {
- // �븯�쐞 �씠�뒋 �젣紐�
- case "DOWN_ISSUE_TITLE" :
+ case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
+ .setDName("downIssueTitle")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -354,60 +362,64 @@
case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.issueStatus")
+ .setDName("downIssueStatus")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
break;
- case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
+ case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priorityName")
+ .setDName("downPriority")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // 以묒슂�룄
+ case "DOWN_SEVERITY" : // 以묒슂�룄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severityName")
+ .setDName("downSeverity")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_SEVERITY"));
break;
- case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ case "DOWN_ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("downAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
- case "REGISTER" : // �벑濡앹옄
+ case "DOWN_REGISTER" : // �벑濡앹옄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
+ .setDName("downRegister")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_REGISTER"));
break;
- case "PERIOD" : // 湲곌컙
+ case "DOWN_PERIOD" : // 湲곌컙
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
+ .setDName("downPeriod")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
- case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ case "DOWN_MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
- .setDName("modifyDate"));
+ .setDName("downModifyDate"));
break;
}
@@ -421,6 +433,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
+ .setDName("downCustomFieldName" + [count])
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -439,7 +452,7 @@
.setHName("issue.relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-30-p bold")
+ .setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -453,7 +466,7 @@
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -482,7 +495,7 @@
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -516,20 +529,20 @@
});
$scope.vm.relTableConfigs = [];
+ /* $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueType")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-30-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_TYPE"))
$scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueType")
- .setDType("renderer")
- .setDAlign("text-center")
- .setHWidth("width-30-p bold")
- .setHSort(false)
- .setDRenderer("ISSUE_RELATION_TYPE"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueTitle")
- .setDType("renderer")
- .setDAlign("text-center")
- .setHWidth("width-60-p bold")
- .setHSort(false)
- .setDRenderer("ISSUE_RELATION_MOVE"))
+ .setHName("issue.relationIssueTitle")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-60-p bold")
+ .setHSort(false)
+ .setDRenderer("ISSUE_RELATION_MOVE"))*/
angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -541,7 +554,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
.setDAlign("text-center"))
@@ -566,13 +579,13 @@
return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
});
$scope.vm.downTableConfigs = [];
- $scope.vm.downTableConfigs.push($tableProvider.config()
+/* $scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
- .setDRenderer("ISSUE_DOWN_MOVE"))
+ .setDRenderer("ISSUE_DOWN_MOVE"))*/
angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Down_issueTableConfig.display) {
@@ -583,7 +596,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
- .setHWidth("width-20-p bold")
+ .setHWidth("width-40-p bold")
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
.setDAlign("text-center"))
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index d6ea913..d39030e 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -86,7 +86,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD/hh-mm-ss A',
+ format: 'YYYY-MM-DD/hh:mm:ss A',
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
daysOfWeek: options.daysOfWeek,
diff --git a/src/main/webapp/views/issue/issueAddDownTableConfig.html b/src/main/webapp/views/issue/issueAddDownTableConfig.html
index bf9e2a3..8d1dd45 100644
--- a/src/main/webapp/views/issue/issueAddDownTableConfig.html
+++ b/src/main/webapp/views/issue/issueAddDownTableConfig.html
@@ -28,14 +28,14 @@
</tr>
</thead>
<tbody>
- <tr>
+ <!--<tr>
<td class="text-center">
<span class="bold" translate="issue.downIssueTitle">�븯�쐞 �씠�뒋 �젣紐�</span>
</td>
<td class="text-center" colspan="3">
<span class="text-danger bold" translate="issue.cannotChangedIssueTitle">�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.</span>
</td>
- </tr>
+ </tr>-->
<tr ng-repeat="issueTableConfig in vm.issueDownTableConfigs">
<td class="text-center">
<span class="bold">{{issueTableConfig.name}}</span>
@@ -74,7 +74,11 @@
</select>
</td>
<td class="text-center">
- <label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>
+ <!-- �븯�쐞 �씠�뒋 �젣紐� �몴�떆 踰꾪듉 disabled -->
+ <label ng-if="!issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ><span class='slider-disabled round'></span></label>
+ <!-- �굹癒몄� 踰꾪듉 �몴�떆 -->
+ <label ng-if="issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ng-model="issueTableConfig.display"><span class='slider round'></span ></label>
+ <!--<label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>-->
</td>
<td class="text-center">
<input type="text" class="form-control" ng-model="issueTableConfig.position" maxlength="2" input-regex="[^0-9]">
diff --git a/src/main/webapp/views/issue/issueAddRelationTableConfig.html b/src/main/webapp/views/issue/issueAddRelationTableConfig.html
index 2028b0c..e4e1c75 100644
--- a/src/main/webapp/views/issue/issueAddRelationTableConfig.html
+++ b/src/main/webapp/views/issue/issueAddRelationTableConfig.html
@@ -28,7 +28,7 @@
</tr>
</thead>
<tbody>
- <tr>
+ <!--<tr>
<td class="text-center">
<span class="bold" translate="issue.relationIssueType">�뿰愿� �씠�뒋 援щ텇</span>
</td>
@@ -43,7 +43,7 @@
<td class="text-center" colspan="3">
<span class="text-danger bold" translate="issue.cannotChangedIssueTitle">�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.</span>
</td>
- </tr>
+ </tr>-->
<tr ng-repeat="issueTableConfig in vm.issueRelTableConfigs">
<td class="text-center">
<span class="bold">{{issueTableConfig.name}}</span>
@@ -82,7 +82,12 @@
</select>
</td>
<td class="text-center">
- <label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>
+ <!-- �뿰愿� �씠�뒋 援щ텇, �뿰愿� �씠�뒋 �젣紐� �몴�떆 踰꾪듉 disabled -->
+ <label ng-if="!issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ><span class='slider-disabled round'></span></label>
+ <!-- �굹癒몄� 踰꾪듉 �몴�떆 -->
+ <label ng-if="issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ng-model="issueTableConfig.display"><span class='slider round'></span ></label>
+
+ <!--<label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>-->
</td>
<td class="text-center">
<input type="text" class="form-control" ng-model="issueTableConfig.position" maxlength="2" input-regex="[^0-9]">
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index ecc2de2..cfed49e 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -101,7 +101,6 @@
</span>
</div>
</span>
-
<a class="show-ticket-info cursor">
<i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 蹂�寃� �씠�젰 �긽�꽭 蹂닿린"></i>
@@ -110,7 +109,7 @@
<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
- <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-skip-back" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
+ <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
<span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
</a>
--
Gitblit v1.8.0