From aa5f2612d0b035a210dda5818e0d3d166efa6a0a Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 03 11월 2021 18:05:12 +0900 Subject: [PATCH] 사용자등급관리 프론트 수정(상세보기 불가) --- src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 80 ++++++++++++--------------------------- 1 files changed, 25 insertions(+), 55 deletions(-) diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js index fb39d05..ac7a1ac 100644 --- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js +++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js @@ -19,8 +19,8 @@ $scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕 $scope.fn.levelAdd = levelAdd; // �벑湲� 異붽� $scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣 - $scope.fn.getPageList = getPageList; // 紐⑸줉 議고쉶 $scope.fn.listView = listView; // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃� + $scope.fn.modify = modify; // �궗�슜�옄 �벑湲� �닔�젙 /* $scope.vm �긽�냽 以� */ $scope.vm.search = { @@ -40,61 +40,13 @@ // �뀒�씠釉� �씠踰ㅽ듃 $scope.vm.tableEvent = { - // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃� + modify : modify // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃� }; // �궗�슜�옄 �벑湲� 由ъ뒪�듃 遺덈윭�삤湲� $scope.$on("getUserLevelList", function () { $scope.fn.getUserLevelList(0); }); - - // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎. - function getPageList(selectedPage, detail = false) { - if (selectedPage < 0) { - selectedPage = 0; - } - // �쁽�옱 �럹�씠吏� �젙蹂� - var currentPage = 0; - - // 荑좏궎�뿉 �꽑�깮�븳 �럹�씠吏� �젙蹂닿� �뾾�쑝硫� 湲곕낯 �럹�씠吏� �젙蹂� 0 �쓣 ���옣 - if (angular.isUndefined(selectedPage) || selectedPage === "") { - currentPage = $scope.vm.page.selectedPage; - } - else { - currentPage = selectedPage; - } - - - // 寃��깋 議곌굔�쓣 ���옣�븳�떎. - //$scope.fn.makeVmSearchObject(); - - - // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽� - if ($rootScope.workProject != null && $rootScope.workProject.id > -1) { - var find = findProjectSearch($rootScope.workProject.id); - if (!find) { - $scope.vm.projects.push($rootScope.workProject); - } - } - - // �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎. - var conditions = $scope.fn.makeSearchConditions(); - - Issue.find($resourceProvider.getContent(conditions, - $resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) { - - if (result.data.message.status === "success") { - $scope.vm.page.selectedPage = currentPage + 1; - $scope.vm.responseData = result.data; - if (detail) { - changeDetailView(result.data.data[0].id); - } - } - else { - SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣 - } - }); - } // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎. function listView() { @@ -105,6 +57,23 @@ $scope.vm.responseData.data = angular.copy(temp); // 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎. $rootScope.currentDetailIssueId = null; + } + + // �궗�슜�옄 �벑湲� �닔�젙 + function modify(id) { + $uibModal.open({ + templateUrl : 'views/workspace/workspaceLevelModify.html', + size : "md", + controller : 'levelModifyController', + backdrop : 'static', + resolve : { + parameter : function () { + return { + id : id + }; + } + } + }); } // �궗�슜�옄 �벑湲� �궘�젣 @@ -169,8 +138,7 @@ }, 100); $scope.fn.listView(); - - $scope.fn.getPageList(0); + $scope.fn.getUserLevelList(0); } else { $timeout(function () { @@ -205,14 +173,15 @@ .setHName("managementWorkspace.levelName") .setHWidth("width-120-p") .setDAlign("text-center") - .setDName("levelName")); + .setDType("renderer") + .setDRenderer("USER_LEVEL_MODIFY")); $scope.vm.tableConfigs1.push($tableProvider.config() .setHName("manageUser.manageWorkspacePerm") .setHWidth("width-120-p") .setDType("renderer") .setDAlign("text-center") - .setDName("manageProject") - .setDRenderer("WORKSPACE_USE_YN")); + .setDName("manageWorkspace") + .setDRenderer("WORKSPACE_SETTING_PERM_YN")); $scope.vm.tableConfigs1.push($tableProvider.config() .setHName("manageUser.manageProjectPerm") .setHWidth("width-120-p") @@ -297,6 +266,7 @@ } }); } + // �벑湲� 異붽� function levelAdd() { $uibModal.open({ -- Gitblit v1.8.0