From 8e7861e68cfba8f27d413437654f435a22f05cac Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 09:15:00 +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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 77fd121..90d340b 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -254,6 +254,7 @@
break;
+
case "COMMON_PRIORITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityName + "'></span>";
break;
@@ -262,13 +263,12 @@
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
break;
- case "ISSUE_USER" :
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
+ case "ISSUE_DEPARTMENT" :
+ makeTag += "<span>" + scope.data.departmentVos.departmentName + "</span>";
break;
- case "ISSUE_DEPARTMENT" :
- scope.data.registsrVos = [scope.data.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="departmentVos"></div>';
+ case "ISSUE_USER" :
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
break;
case "REGISTER" :
--
Gitblit v1.8.0