From dc79ec21ead7e9ac5949bba185f8d9b7f5c68665 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:30:16 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 2 +-
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 2 ++
src/main/webapp/views/workspace/workspaceLevelAdd.html | 2 +-
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 26 +++++++++++++-------------
src/main/webapp/scripts/app/workspace/levelModify.controller.js | 2 +-
src/main/resources/migration/V1_10__Alter_Table.sql | 2 ++
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
index f78a811..b8e4dce 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -85,6 +85,14 @@
this.basicUser = basicUser;
}
+ public List<Long> getRemoveIds() {
+ return removeIds;
+ }
+
+ public void setRemoveIds(List<Long> removeIds) {
+ this.removeIds = removeIds;
+ }
+
public Boolean getPermWorkSpaceSetting() {
return permWorkSpaceSetting;
}
@@ -141,14 +149,6 @@
this.permQnA = permQnA;
}
- public Boolean getPermEvent() {
- return permEvent;
- }
-
- public void setPermEvent(Boolean permEvent) {
- this.permEvent = permEvent;
- }
-
public Boolean getPermGuide() {
return permGuide;
}
@@ -157,12 +157,12 @@
this.permGuide = permGuide;
}
- public List<Long> getRemoveIds() {
- return removeIds;
+ public Boolean getPermEvent() {
+ return permEvent;
}
- public void setRemoveIds(List<Long> removeIds) {
- this.removeIds = removeIds;
+ public void setPermEvent(Boolean permEvent) {
+ this.permEvent = permEvent;
}
public void makePermission() {
@@ -170,8 +170,8 @@
this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
- this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
+ this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
this.permission |= MngPermission.makePermission(getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
this.permission |= MngPermission.makePermission(getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
this.permission |= MngPermission.makePermission(getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);
diff --git a/src/main/resources/migration/V1_10__Alter_Table.sql b/src/main/resources/migration/V1_10__Alter_Table.sql
index 94a4154..95e9573 100644
--- a/src/main/resources/migration/V1_10__Alter_Table.sql
+++ b/src/main/resources/migration/V1_10__Alter_Table.sql
@@ -26,3 +26,5 @@
PRIMARY KEY (`id`) USING btree
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ALTER TABLE `user_workspace` ADD COLUMN `level_name` VARCHAR(50) NOT NULL;
+ALTER TABLE `user_workspace` ADD COLUMN `department_name` VARCHAR(50) NOT NULL;
\ No newline at end of file
diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index 0b89246..cde0860 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -9,6 +9,8 @@
u.id as userId,
u.name as userName,
u.account as account,
+ u.levelName as levelName,
+ u.departmentName as departmentName,
/*u.permission as permission,*/
CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
FROM
diff --git a/src/main/webapp/scripts/app/workspace/levelModify.controller.js b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
index 5dc37d5..767b821 100644
--- a/src/main/webapp/scripts/app/workspace/levelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
@@ -74,7 +74,7 @@
//description : $rootScope.preventXss($scope.vm.form.description)
};
- UserWorkspace.levelModify($resourceProvider.getContent(condition,
+ UserWorkspace.modifyLevel($resourceProvider.getContent(condition,
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index 1045f3c..81a0a45 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -21,7 +21,7 @@
$scope.vm = {
form : {
levelName : "",
- permWorkspaceSetting : false,
+ permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
permApi : false,
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index 73ab5ad..6936ef0 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -38,7 +38,7 @@
<span translate="manageUser.manageWorkspacePerm">�썙�겕�뒪�럹�씠�뒪 愿�由�</span>
</td>
<td colspan="2">
- <label class='switch'><input type='checkbox' ng-model='vm.form.permWorkspaceSetting'><span class='slider round'></span></label>
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permWorkSpaceSetting'><span class='slider round'></span></label>
</td>
</tr>
<tr>
--
Gitblit v1.8.0