From fe1b9e8b4e54fb22022a0d13cc57b72bc8ba9840 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 05 11월 2021 19:12:00 +0900
Subject: [PATCH] "부서 관리" 및 "사용자 관리" 프론트 완료
---
src/main/webapp/scripts/app/workspace/departmentModify.controller.js | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/departmentModify.controller.js b/src/main/webapp/scripts/app/workspace/departmentModify.controller.js
index 405e87e..d025eda 100644
--- a/src/main/webapp/scripts/app/workspace/departmentModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/departmentModify.controller.js
@@ -12,7 +12,7 @@
function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, UserWorkspace, parameter, SweetAlert, $filter) {
$scope.fn = {
- getDepartmentList : getDepartmentList, // 遺��꽌 愿�由� 由ъ뒪�듃
+ detail : detail, // �긽�꽭 議고쉶
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
@@ -22,28 +22,28 @@
id : parameter.id,
form : {
departmentName : "",
- departmentEx : ""
+ departmentDescription : ""
}
};
- // 遺��꽌 愿�由� 紐⑸줉 議고쉶
- function getDepartmentList() {
-
+ // �긽�꽭 �젙蹂�
+ function detail() {
var conditions = {
- id : $scope.vm.id
- };
+ id : parameter.id
+ }
- //�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
- UserWorkspace.departmentFind($resourceProvider.getContent(conditions,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ UserWorkspace.departmentDetail($resourceProvider.getContent(
+ conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.form.departmentName = result.data.data[0].departmentName; //departmentName 媛��졇�삤湲�
- $scope.vm.form.departmentDescription = result.data.data[0].departmentDescription; //departmentEx 媛��졇�삤湲�
-
+ if (angular.isDefined(result.data.data)) {
+ $scope.vm.form.departmentName = result.data.data.departmentName;
+ $scope.vm.form.departmentDescription = result.data.data.departmentDescription;
+ }
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // "遺��꽌 愿�由� 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.swal($filter("translate")("customField.failedToDetailUserDefinedFields"), result.data.message.message, "error"); // "�궗�슜�옄 �젙�쓽 �븘�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
}
});
}
@@ -57,16 +57,16 @@
}
// �뤌 �쟾�넚
- function formSubmit(condition) {
+ function formSubmit() {
$rootScope.spinner = true;
var content = {
id : parameter.id,
- title : $rootScope.preventXss($scope.vm.form.departmentName),
- description : $rootScope.preventXss($scope.vm.form.departmentDescription)
+ departmentName : $rootScope.preventXss($scope.vm.form.departmentName),
+ departmentDescription : $rootScope.preventXss($scope.vm.form.departmentDescription)
};
- UserWorkspace.modifyDepartment($resourceProvider.getContent(condition,
+ UserWorkspace.departmentModify($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -91,7 +91,7 @@
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
- $scope.fn.getDepartmentList();
+ $scope.fn.detail();
}]);
});
--
Gitblit v1.8.0