From 0bf55ecf79413ab8eb62cff68cb489bd36af5ae1 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 12 11월 2021 11:47:24 +0900
Subject: [PATCH] 사용자 등급관리 등급명, 등급권한 관련 오류 수정
---
src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java | 12 ++++++++++++
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js | 9 ++++-----
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 10 ++++++++--
src/main/java/kr/wisestone/owl/service/UserLevelService.java | 2 ++
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js | 6 ++++++
5 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/UserLevelService.java b/src/main/java/kr/wisestone/owl/service/UserLevelService.java
index c40b3b6..7335a65 100644
--- a/src/main/java/kr/wisestone/owl/service/UserLevelService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserLevelService.java
@@ -38,4 +38,6 @@
ModelAndView downloadExcel(HttpServletRequest request, Model model);
void modifyLevelPermission(UserLevelForm userLevelForm);
+
+ void modifyLevelName(UserLevelForm make);
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
index b3baa2c..dc6204a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -267,13 +267,19 @@
newPermission |= MngPermission.makePermission(userLevelForm.getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
newPermission |= MngPermission.makePermission(userLevelForm.getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
newPermission |= MngPermission.makePermission(userLevelForm.getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);
- newPermission |= MngPermission.makePermission(userLevelForm.getPermEvent(), MngPermission.USER_PERMISSION_MNG_EVENT);
+ /*newPermission |= MngPermission.makePermission(userLevelForm.getPermEvent(), MngPermission.USER_PERMISSION_MNG_EVENT);*/
newPermission |= MngPermission.makePermission(userLevelForm.getPermGuide(), MngPermission.USER_PERMISSION_MNG_GUIDE);
UserLevel userLevel = userLevelService.getUserLevel(userLevelForm.getId());
/* user.setPermission(newPermission);*/
-
userLevel.setPermission(newPermission);
this.userLevelRepository.saveAndFlush(userLevel);
}
+
+ @Override
+ public void modifyLevelName(UserLevelForm userLevelForm) {
+ UserLevel userLevel = userLevelService.getUserLevel(userLevelForm.getId());
+ userLevel.setLevelName(userLevelForm.getLevelName());
+ this.userLevelRepository.saveAndFlush(userLevel);
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
index 547e2f0..72f1499 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
@@ -61,6 +61,18 @@
return this.setSuccessMessage(resJsonData);
}
+ // �궗�슜�옄�벑湲됰챸留� �닔�젙
+ @RequestMapping(value = "/userLevel/nameModify", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> nameModify(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ this.userLevelService.modifyLevelName(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �궗�슜�옄�벑湲� �닔�젙
@RequestMapping(value = "/userLevel/modify", produces = MediaType.APPLICATION_JSON_VALUE)
public
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
index fdc77d8..508ae6f 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -22,7 +22,7 @@
id : parameter.id,
form : {
levelName : "",
- permWorkspaceSetting : false,
+ permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
permApi : false,
@@ -63,16 +63,15 @@
}
// �뤌 �쟾�넚
- function formSubmit(condition) {
+ function formSubmit() {
$rootScope.spinner = true;
var content = {
id : parameter.id,
- title : $rootScope.preventXss($scope.vm.form.title),
- //description : $rootScope.preventXss($scope.vm.form.description)
+ levelName : $rootScope.preventXss($scope.vm.form.levelName)
};
- UserWorkspace.levelModify($resourceProvider.getContent(condition,
+ UserWorkspace.levelNameModify($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
diff --git a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
index d5e28c0..511b597 100644
--- a/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
+++ b/src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -19,6 +19,12 @@
return response;
});
},
+ levelNameModify : function (conditions) {
+ return $http.post("userLevel/nameModify", conditions).then(function (response) {
+ $log.debug("�궗�슜�옄 �벑湲� �닔�젙 寃곌낵 : ", response);
+ return response;
+ });
+ },
levelModify : function (conditions) {
return $http.post("userLevel/modify", conditions).then(function (response) {
$log.debug("�궗�슜�옄 �벑湲� �닔�젙 寃곌낵 : ", response);
--
Gitblit v1.8.0