From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:55:10 +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 | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 398df12..1546743 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -285,7 +285,7 @@
case "USER_LEVEL_MODIFY":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
- makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.levelName.replace(/</gi, '<') + "</span>";
+ makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyLevel(data.id)'>" + scope.data.levelName + "</span>";
}
else {
makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.levelName + "</span>";
@@ -293,39 +293,52 @@
break;
case "WORKSPACE_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permWorkSpaceSetting' ng-click='event.modify(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permWorkSpaceSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "PROJECT_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permProjectSetting' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permProjectSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "ISSUE_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
- case "USER_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permUser' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ case "API_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permApi' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "NOTICE_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permNotice' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permNotice' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "FAQ_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permFAQ' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permFAQ' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "QNA_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permQnA' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permQnA' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "EVENT_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permEvent' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permEvent' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "GUIDE_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permGuide' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permGuide' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ break;
+
+ case "DEPARTMENT_OPTION" :
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change=''><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ break;
+
+ 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=''><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>";
break;
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
--
Gitblit v1.8.0