From ec1290e99bd572a443582cd177f8352d952fce89 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 10:12:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js | 2
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js | 1
src/main/webapp/i18n/ko/global.json | 1
src/main/webapp/scripts/app/project/projectList.controller.js | 2
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 42 ++++++++++----------
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 14 +++++++
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 7 +++
7 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 7e823ba..94af71b 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -6,14 +6,14 @@
common.major=\uB192\uC74C
common.minor=\uBCF4\uD1B5
common.trivial=\uB0AE\uC74C
-common.issue=\uC77C\uAC10
-common.issueList=\uC77C\uAC10 \uBAA9\uB85D
+common.issue=\uC774\uC288
+common.issueList=\uC774\uC288 \uBAA9\uB85D
common.status=\uC0C1\uD0DC
common.level=\uB4F1\uAE09
-common.issueKey=\uC77C\uAC10 \uBC88\uD638
-common.issueTitle=\uC77C\uAC10 \uC81C\uBAA9
+common.issueKey=\uC774\uC288 \uBC88\uD638
+common.issueTitle=\uC774\uC288 \uC81C\uBAA9
common.content=\uB0B4\uC6A9
-common.issueType=\uC77C\uAC10 \uC720\uD615
+common.issueType=\uC774\uC288 \uC720\uD615
common.priority=\uC6B0\uC120\uC21C\uC704
common.importance=\uC911\uC694\uB3C4
common.assignee=\uB2F4\uB2F9\uC790
@@ -36,16 +36,16 @@
common.reversalStatusUpdate=\uBC88\uBCF5\uB418\uB294 \uC0C1\uD0DC \uBCC0\uACBD
common.typeErrorDownloadWidget=\uB2E4\uC6B4\uB85C\uB4DC \uC704\uC82F \uC720\uD615 \uC624\uB958
common.inProgressProjectStatus=\uC9C4\uD589 \uC911\uC778 \uD504\uB85C\uC81D\uD2B8 \uD604\uD669
-common.registerExcelIssue=\uC5D1\uC140\uB85C \uC77C\uAC10 \uB4F1\uB85D\uD558\uAE30
-common.assignedToMeIssue=\uB098\uC5D0\uAC8C \uD560\uB2F9\uB41C \uC77C\uAC10
+common.registerExcelIssue=\uC5D1\uC140\uB85C \uC774\uC288 \uB4F1\uB85D\uD558\uAE30
+common.assignedToMeIssue=\uB098\uC5D0\uAC8C \uD560\uB2F9\uB41C \uC774\uC288
common.managementRisk=\uC704\uD5D8 \uAD00\uB9AC
-common.registeredByMeIssue=\uB0B4\uAC00 \uB4F1\uB85D\uD55C \uC77C\uAC10 \uD604\uD669
+common.registeredByMeIssue=\uB0B4\uAC00 \uB4F1\uB85D\uD55C \uC774\uC288 \uD604\uD669
common.delayDate=\uC9C0\uC5F0\uC77C
-common.delayingIssue=\uC9C0\uC5F0 \uC911\uC778 \uC77C\uAC10
-common.assignedIssue=\uB2F4\uB2F9 \uC77C\uAC10
+common.delayingIssue=\uC9C0\uC5F0 \uC911\uC778 \uC774\uC288
+common.assignedIssue=\uB2F4\uB2F9 \uC774\uC288
common.delaying=\uC9C0\uC5F0\uC911
common.progressByMember=\uBA64\uBC84\uBCC4 \uC9C4\uD589\uB960
-common.myIssueStatus=\uB098\uC758 \uC77C\uAC10 \uD604\uD669
+common.myIssueStatus=\uB098\uC758 \uC774\uC288 \uD604\uD669
common.division=\uAD6C\uBD84
common.complete=\uC644\uB8CC
common.issueManagementProject=\uC774\uC288 \uAD00\uB9AC \uD504\uB85C\uC81D\uD2B8
@@ -61,8 +61,8 @@
common.check=\uD655\uC778
common.approval=\uC2B9\uC778
common.noApproval=\uC2B9\uC778 \uBD88\uAC00
-common.issueStatusList=\uC77C\uAC10 \uC0C1\uD0DC \uBAA9\uB85D
-common.issueStatus=\uC77C\uAC10 \uC0C1\uD0DC
+common.issueStatusList=\uC774\uC288 \uC0C1\uD0DC \uBAA9\uB85D
+common.issueStatus=\uC774\uC288 \uC0C1\uD0DC
common.statusProperties=\uC0C1\uD0DC \uC18D\uC131
common.color=\uC0C9\uC0C1
common.workflow=\uC6CC\uD06C\uD50C\uB85C\uC6B0
@@ -89,24 +89,24 @@
common.improvement=\uAC1C\uC120
common.requirement=\uC694\uAD6C \uC0AC\uD56D
common.testcase=\uD14C\uC2A4\uD2B8 \uCF00\uC774\uC2A4
-common.issueTypeList=\uC77C\uAC10 \uD0C0\uC785 \uBAA9\uB85D
+common.issueTypeList=\uC774\uC288 \uD0C0\uC785 \uBAA9\uB85D
common.excelDownloadNotPossibleExcludedFromTheWorkspace=\uC5C5\uBB34 \uACF5\uAC04\uC5D0\uC11C \uCC38\uC5EC\uAC00 \uC81C\uC678\uB418\uC5B4 \uC5D1\uC140 \uB2E4\uC6B4\uB85C\uB4DC\uAC00 \uBD88\uAC00\uB2A5\uD569\uB2C8\uB2E4.
common.sWorkspace=\uC758 \uC5C5\uBB34\uACF5\uAC04
common.few= \uAC74
-common.createIssue=\uC77C\uAC10 \uC0DD\uC131
-common.updateIssue=\uC77C\uAC10 \uBCC0\uACBD
-common.deleteIssue=\uC77C\uAC10 \uC0AD\uC81C
+common.createIssue=\uC774\uC288 \uC0DD\uC131
+common.updateIssue=\uC774\uC288 \uBCC0\uACBD
+common.deleteIssue=\uC774\uC288 \uC0AD\uC81C
common.updateTitle=\uC81C\uBAA9\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateContent=\uB0B4\uC6A9\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateProject=\uD504\uB85C\uC81D\uD2B8\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateSeverity=\uC911\uC694\uB3C4\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updatePriority=\uC6B0\uC120\uC21C\uC704\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updateStatus=\uC0C1\uD0DC\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-common.updateWorkflowNotExist=\uBCC0\uACBD\uB41C \uC6CC\uD06C\uD50C\uB85C\uC6B0\uC5D0\uC11C \uC0C1\uD0DC\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC544 \uC77C\uAC10\uC758 \uC0C1\uD0DC\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-common.updateIssueType=\uC77C\uAC10 \uD0C0\uC785\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+common.updateWorkflowNotExist=\uBCC0\uACBD\uB41C \uC6CC\uD06C\uD50C\uB85C\uC6B0\uC5D0\uC11C \uC0C1\uD0DC\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC544 \uC774\uC288\uC758 \uC0C1\uD0DC\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+common.updateIssueType=\uC774\uC288 \uD0C0\uC785\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updatePeriod=\uAE30\uAC04\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-common.remainIssue=\uC794\uC5EC \uC77C\uAC10
-common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC77C\uAC10 \uD604\uD669
+common.remainIssue=\uC794\uC5EC \uC774\uC288
+common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC774\uC288 \uD604\uD669
managementWorkspace.levelName=\uB4F1\uAE09\uBA85
manageUser.manageWorkspacePerm=\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uAD00\uB9AC
manageUser.manageProjectPerm=\uD504\uB85C\uC81D\uD2B8 \uAD00\uB9AC
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 5c46669..8a7e723 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -101,6 +101,16 @@
makeTag += '<div owl-profile-over class="" table-user-image="data" target="projectUserVos"></div>';
break;
+ case "PROJECT_DEPARTMENT":
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='cursor: pointer; color: #000000'>";
+ angular.forEach(scope.data.projectDepartmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
case "ISSUE_STATUS_TYPE" :
switch (scope.data.issueStatusType) {
case "READY":
@@ -494,6 +504,10 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
+ case "USE_COMPANY_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permUseCompanySetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ break;
+
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;
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index f89fc50..c584f6f 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -554,6 +554,7 @@
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
"manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
+ "manageUseCompanyPerm": "�뾽泥� 由ъ뒪�듃 愿�由�",
"manageUserPerm": "�궗�슜�옄 愿�由�",
"manageApiPerm" : "API 愿�由�",
"manageNoticePerm": "怨듭��궗�빆 愿�由�",
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
index 97af0f2..e7f15cf 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
@@ -92,7 +92,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("hostingField.memo")
.setHWidth("bold")
- .setDName("desc")
+ .setDName("memo")
.setDAlign("text-center"));
}
diff --git a/src/main/webapp/scripts/app/project/projectList.controller.js b/src/main/webapp/scripts/app/project/projectList.controller.js
index 3999767..0e62c35 100644
--- a/src/main/webapp/scripts/app/project/projectList.controller.js
+++ b/src/main/webapp/scripts/app/project/projectList.controller.js
@@ -111,7 +111,7 @@
.setHWidth("width-140-p bold")
.setDType("renderer")
.setDAlign("text-center")
- .setDRenderer("PROJECT_USER"));
+ .setDRenderer("PROJECT_DEPARTMENT"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("project.projectKey")
.setHWidth("width-100-p bold")
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
index 508ae6f..f62ad14 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -25,6 +25,7 @@
permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
+ permUseCompany : false,
permApi : false,
permNotice : false,
permFAQ : false,
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index e818c63..b95ac5c 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -210,6 +210,13 @@
.setDName("IssueSystem")
.setDRenderer("ISSUE_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.manageUseCompanyPerm")
+ .setHWidth("width-120-p")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setDName("UseCompany")
+ .setDRenderer("USE_COMPANY_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageApiPerm")
.setHWidth("width-120-p")
.setDType("renderer")
--
Gitblit v1.8.0