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 | 93 ++++++++++++++++++++++++++++++++++------------
1 files changed, 69 insertions(+), 24 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 00bcb51..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;
@@ -151,17 +155,18 @@
case "USE_DEPARTMENT_LIST" :
makeTag += "<ul class='ul-not-comma'>";
-
- if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
- }else{
- makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
- angular.forEach(scope.data.departmentVos, function (departments) {
- makeTag += "<li>" + departments.departmentName + "</li>";
- });
- makeTag += "</div>";
+ if (scope.data.managerYn !== 'Y'){
+ if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ }else{
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ }
+ makeTag += "</ul>";
}
- makeTag += "</ul>";
break;
case "WORKFLOW_DEPARTMENT_LIST" :
@@ -241,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;
// �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
@@ -312,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;
// �븯�쐞 �씠�뒋 �슦�꽑 �닚�쐞
@@ -491,6 +500,33 @@
makeTag += "</ul>";
break;
+ // �뾽泥�
+ case "USE_COMPANY" :
+ if (scope.data.companyName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // ISP
+ case "USE_ISP" :
+ if (scope.data.ispName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // �샇�뒪�똿
+ case "USE_HOSTING" :
+ if (scope.data.ispName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
case "WORKFLOW_NAME":
makeTag += "<span>" + scope.data.workflowVo.name + "</span>";
break;
@@ -623,11 +659,17 @@
case "LEVEL_OPTION" :
//makeTag += "<select class='form-control input-sm' ng-model='data.levels[0].id' ng-options='levelName.id as levelName.levelName for levelName in data.levels' ></select>";
- makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ if (scope.data.managerYn === 'Y'){
+ makeTag +="<span>理쒓퀬愿�由ъ옄</span>";
+ } else {
+ makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ }
break;
case "WORKSPACE_USE_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ if (scope.data.managerYn !== 'Y'){
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ }
break;
case "COMPANYFIELD_MODIFY" :
@@ -685,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')) {
@@ -698,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" :
@@ -738,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 {
@@ -754,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