From 813a0495502daa59e5c78ecffb66db48d4cf9720 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 18:30:00 +0900
Subject: [PATCH] 이슈리스트 새로고침 수정
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 d78036d..13484af 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -153,9 +153,9 @@
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>";
+ 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)'>";
+ 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>";
});
@@ -424,8 +424,10 @@
makeTag += '<span class="number-tag">' + scope.data.projectKey + ' - ' + scope.data.issueNumber + '</span>';
makeTag += ' <span class="tag"> / </span> ';
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.issueStatusColor + "\"," + "\"border-color\"" + " : \"" + scope.data.issueStatusColor + "\", \"color\": \"#FFFFFF\" }'>" + scope.data.issueStatusName + "</span>";
- makeTag += '<span class="tag"> / </span> ';
- makeTag += '<span class="tag">' +'<span>API: </span>' + scope.data.isApi + '</span>';
+ if (scope.data.isApi === 'Y') {
+ makeTag += '<span class="tag"> / </span> ';
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"#EF8D9A" + "\"," + "\"border-color\"" + " : \"#EF8D9A" + "\", \"color\": \"#FFFFFF\" }'>" + "<span>API</span>" + "</span>";
+ }
makeTag += '</div>';
makeTag += '<div class="titlename cursor text-left" ng-click="event.changeDetailView(data.id)">' + scope.data.title.replace(/</gi, '<') + '</div>';
makeTag += '<div class="extra-infodiv text-left">';
@@ -467,9 +469,21 @@
break;
// �벑濡앹옄
- case "REGISTER" :
+ /* case "REGISTER" :
scope.data.registerVos = [scope.data.registerVo];
makeTag += '<div ng-click=\"event.changeDetailView(data.id)\" owl-profile-over class="cursor" table-user-image="data" target="registerVos"></div>';
+ break;*/
+
+ case "REGISTER" :
+ scope.data.registerVos = [scope.data.registerVo];
+ makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\" class='ul-not-comma cursor'>";
+ makeTag += "<div style='color: #000000'>";
+ angular.forEach(scope.data.registerVos, function (registers) {
+ makeTag += "<li class='titlenameRegister cursor'>" + registers.name + "</li>";
+ makeTag += "<li class='titlenameAccount cursor'>" + registers.account + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
break;
case "WORKFLOW_NAME":
@@ -537,8 +551,8 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
- case "All_ISSUE_PROJECT_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permAllIssueAndProjectSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ case "ISSUE_SYSTEM_SETTING_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSystemSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "PARTNER_SETTING_PERM_YN" :
--
Gitblit v1.8.0