From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 a18aa93..0c53523 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -132,6 +132,18 @@
makeTag += "</ul>";
break;
+ case "USE_DEPARTMENT_LIST" :
+ makeTag += "<ul class='ul-not-comma'>";
+
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(scope.data.id)'>";
+ angular.forEach(scope.data.departments, function (department) { //departmentVO濡� �닔�젙 泥댄겕 �븘�슂
+ makeTag += "<li>" + department.fieldValue + "</li>";
+ });
+ makeTag += "</div>";
+
+ makeTag += "</ul>";
+ break;
+
case "CONFIG" :
makeTag += '<a ng-click="event.modify(data.id)"><i class="fa fa-pencil fa-lg" uib-tooltip="�닔�젙"></i></a>';
break;
@@ -375,6 +387,24 @@
}
break;
+ case "ISPFIELD_MODIFY" :
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
+ }
+ break;
+
+ case "HOSTINGFIELD_MODIFY" :
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ else {
+ makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
+ }
+ break;
+
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
var values = [];
--
Gitblit v1.8.0