From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

---
 src/main/webapp/views/issue/issueAddRelationTableConfig.html |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/issue/issueAddRelationTableConfig.html b/src/main/webapp/views/issue/issueAddRelationTableConfig.html
index e6b7b19..e4e1c75 100644
--- a/src/main/webapp/views/issue/issueAddRelationTableConfig.html
+++ b/src/main/webapp/views/issue/issueAddRelationTableConfig.html
@@ -9,7 +9,7 @@
     </div>
 
     <div class="modal-body">
-        <form role="form" name="issueTableConfigForm">
+        <form role="form" name="issueRelTableConfigForm">
             <table class="table table-dash table-lightborder table-layout-fixed">
                 <thead>
                 <tr>
@@ -28,21 +28,23 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr>
+                <!--<tr>
                     <td class="text-center">
                         <span class="bold" translate="issue.relationIssueType">�뿰愿� �씠�뒋 援щ텇</span>
                     </td>
                     <td class="text-center" colspan="3">
-                        <span class="text-danger bold" translate="issue.cannotChangedIssueTitle">�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.</span>
+                        <span class="text-danger bold" translate="issue.cannotChangedIssueType">�씠�뒋 援щ텇�� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.</span>
                     </td>
+                </tr>
+                <tr>
                     <td class="text-center">
-                        <span class="bold" translate="issue.relationIssueTitle">�뿰愿� �씠�뒋 援щ텇</span>
+                        <span class="bold" translate="issue.relationIssueTitle">�뿰愿� �씠�뒋 �젣紐�</span>
                     </td>
                     <td class="text-center" colspan="3">
                         <span class="text-danger bold" translate="issue.cannotChangedIssueTitle">�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.</span>
                     </td>
-                </tr>
-                <tr ng-repeat="issueTableConfig in vm.issueTableConfigs">
+                </tr>-->
+                <tr ng-repeat="issueTableConfig in vm.issueRelTableConfigs">
                     <td class="text-center">
                         <span class="bold">{{issueTableConfig.name}}</span>
                     </td>
@@ -80,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]">
@@ -94,7 +101,7 @@
     <div class="modal-footer buttons-on-right">
         <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.close">�떕湲�</span></button>
         <button type="button" class="btn btn-md btn-primary bold"
-                ng-disabled="fn.formCheck(issueTableConfigForm.$invalid)"
+                ng-disabled="fn.formCheck(issueRelTableConfigForm.$invalid)"
                 ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
         </button>
     </div>

--
Gitblit v1.8.0