From ed804c897be0a634116665bb073eb6bbedbc031b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 20:06:28 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 2be164a..7bc7528 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -74,10 +74,14 @@
// �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜)
case "PROJECT_NAME" :
- if ($rootScope.workProject != null && $rootScope.workProject.id == scope.data.id) {
- makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
- } else {
- makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ if (!scope.data.parentYn) {
+ if ($rootScope.workProject != null && $rootScope.workProject.id == scope.data.id) {
+ makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ } else {
+ makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ }else {
+ makeTag += "<span class='titlename cursor table-word-break-all sub-line'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
}
break;
@@ -242,7 +246,9 @@
// �뿰愿��씠�뒋 �궘�젣
case "ISSUE_RELATION_DELETE":
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ if (scope.data.modifyPermissionCheck) {
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ }
break;
// �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
@@ -313,7 +319,9 @@
// �븯�쐞 �씠�뒋 �궘�젣
case "ISSUE_DOWN_DELETE":
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
+ if (scope.data.modifyPermissionCheck) {
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
+ }
break;
// �븯�쐞 �씠�뒋 �슦�꽑 �닚�쐞
@@ -719,7 +727,8 @@
break;
case "NOTICE_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
+ //makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer+ '</span>';
break;
case "GUIDE_MODIFY":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_GUIDE')) {
@@ -732,7 +741,7 @@
break;
case "GUIDE_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
case "GUIDE_ACTIVE" :
@@ -772,14 +781,16 @@
break;
case "FAQ_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
case "FAQ_ACTIVE" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_FAQ')) {
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
+ }
break;
case "QNA_MODIFY":
- if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA')) {
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA') || $rootScope.user.id === scope.data.registerId) {
makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.title.replace(/</gi, '<') + "</span>";
}
else {
@@ -788,7 +799,7 @@
break;
case "QNA_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
}
}
--
Gitblit v1.8.0