From 1f48550c5b7ef46fe33c869d60b1e6c758488942 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 17:56:35 +0900
Subject: [PATCH] 하위 프로젝트에만 속해있는 일반회원은 프로젝트 리스트에서 하위 프로젝트가 보이지 않는 현상 수정
---
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 58d1229..41c6544 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -7,27 +7,54 @@
'app'
],
function (app) {
- app.controller('companyFieldAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'CompanyField', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, $state, CompanyField, $filter) {
+ app.controller('companyFieldAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'CompanyField', '$filter', '$injector','$controller',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, $state, CompanyField, $filter, $injector, $controller) {
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
};
$scope.vm = {
form : {
name : "", //�뾽泥대챸
- companyType : "", //�뾽泥대텇瑜�
- profitYN : "", //�쁺由�/鍮꾩쁺由�
- industry : "", //�궛�뾽遺꾨쪟
- domain : "", //�룄硫붿씤
- email : "", //�씠硫붿씪
+ ispId : "",
+ ispName : "",
+ hostingName : "",
+ hostingId : "",
+ manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
- desc : "" //硫붾え(鍮꾧퀬)
+ email : "", //�씠硫붿씪
+ url : "", // url
+ memo : "" //鍮꾧퀬
+ },
+ autoCompletePage : {
+ ispField : {
+ page : 0,
+ totalPage : 0
+ },
+ hostingField : {
+ page : 0,
+ totalPage : 0
+ }
}
};
+
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+
+ // ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIssueIspFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
+ }
+
+ // �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIssueHostingFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
+ }
// �뤌 泥댄겕
function formCheck(formInvalid) {
@@ -37,19 +64,39 @@
return false;
}
+ $scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.form.ispId = result[0].id;
+ });
+
+ $scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.form.hostingId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit(condition) {
$rootScope.spinner = true;
var content = {
name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
- companyType : $scope.vm.form.companyType, //�뾽泥대텇瑜�
- profitYN : $scope.vm.form.profitYN, //�쁺由�/鍮꾩쁺由�
- industry : $scope.vm.form.industry, //�궛�뾽遺꾨쪟
- domain : $scope.vm.form.domain, //�룄硫붿씤
- email : $scope.vm.form.email, //�씠硫붿씪
+ ispId : (function () { // ISP �븘�씠�뵒
+ var ispId = -1;
+ if ($scope.vm.form.issueIspFields != null) {
+ ispId = $scope.vm.form.ispId;
+ }
+ return ispId;
+ })(),
+ hostingId : (function () { // Hosting �븘�씠�뵒
+ var hostingId = -1;
+ if ($scope.vm.form.issueHostingFields != null) {
+ hostingId = $scope.vm.form.hostingId;
+ }
+ return hostingId;
+ })(),
+ manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
- desc : $scope.vm.form.desc //硫붾え(鍮꾧퀬)
+ email : $scope.vm.form.email, //�씠硫붿씪
+ url : $scope.vm.form.url, // url
+ memo : $scope.vm.form.memo //鍮꾧퀬
};
CompanyField.add($resourceProvider.getContent(content,
@@ -58,10 +105,10 @@
if (result.data.message.status === "success") {
$scope.fn.cancel();
// 紐⑸줉 �솕硫� 媛깆떊
- $rootScope.$broadcast("getDepartmentList", {});
+ $rootScope.$broadcast("getPageList", {});
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedLevelRegistration"), result.data.message.message);
+ SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message);
}
$rootScope.spinner = false;
--
Gitblit v1.8.0