From 1f48550c5b7ef46fe33c869d60b1e6c758488942 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 27 12월 2021 17:56:35 +0900 Subject: [PATCH] 하위 프로젝트에만 속해있는 일반회원은 프로젝트 리스트에서 하위 프로젝트가 보이지 않는 현상 수정 --- src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 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 87d40cf..6abb30e 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; @@ -492,6 +496,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; -- Gitblit v1.8.0