From 171d9bc308a76fba7ddd78acd1871af3a2a107c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 11:47:41 +0900
Subject: [PATCH] 이슈 수정 시 isp/호스팅 목록에 같은게 추가되는 현상 해결
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 6c18b0b..957c2d0 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -371,6 +371,9 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
+ var ispFieldVo = result[0].ispFieldVo;
+ var hostingFieldVo = result[0].hostingFieldVo;
+
$scope.vm.companyId = result[0].id;
$scope.vm.companyName = result[0].name;
$scope.vm.companyManager = result[0].manager;
@@ -379,6 +382,44 @@
$scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
+ $scope.vm.ispId = "";
+ $scope.vm.ispName = "";
+ $scope.vm.ispCode = "";
+ $scope.vm.ispManager = "";
+ $scope.vm.ispTel = "";
+ $scope.vm.ispEmail = "";
+ $scope.vm.ispUrl = "";
+ $scope.vm.ispMemo = "";
+
+ $scope.vm.hostingId = "";
+ $scope.vm.hostingName = "";
+ $scope.vm.hostingCode = "";
+ $scope.vm.hostingManager = "";
+ $scope.vm.hostingTel = "";
+ $scope.vm.hostingEmail = "";
+ $scope.vm.hostingUrl = "";
+ $scope.vm.hostingMemo = "";
+
+ if (ispFieldVo != null){
+ $scope.vm.ispId = ispFieldVo.id;
+ $scope.vm.ispName = ispFieldVo.name;
+ $scope.vm.ispCode = ispFieldVo.code;
+ $scope.vm.ispManager = ispFieldVo.manager;
+ $scope.vm.ispTel = ispFieldVo.tel;
+ $scope.vm.ispEmail = ispFieldVo.email;
+ $scope.vm.ispUrl = ispFieldVo.url;
+ $scope.vm.ispMemo = ispFieldVo.memo;
+ }
+ if (hostingFieldVo != null){
+ $scope.vm.hostingId = hostingFieldVo.id;
+ $scope.vm.hostingName = hostingFieldVo.name;
+ $scope.vm.hostingCode = hostingFieldVo.code;
+ $scope.vm.hostingManager = hostingFieldVo.manager;
+ $scope.vm.hostingTel = hostingFieldVo.tel;
+ $scope.vm.hostingEmail = hostingFieldVo.email;
+ $scope.vm.hostingUrl = hostingFieldVo.url;
+ $scope.vm.hostingMemo = hostingFieldVo.memo;
+ }
});
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
@@ -471,7 +512,7 @@
hostingId : (function () {
var hostingId = -1;
- if ($scope.vm.form.issueHostingFields.length > 0) {
+ if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
}
@@ -531,11 +572,11 @@
issueIspFields : (function () {
var issueIspFields = [];
- if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
- var ispField = $scope.vm.form.issueIspFields[0];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
+ || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
issueIspFields.push({
- id : ispField.id,
ispId : $scope.vm.ispId,
code : $scope.vm.ispCode,
name : $scope.vm.ispName,
@@ -553,12 +594,11 @@
issueHostingFields : (function () {
var issueHostingFields = [];
- if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
-
- var hostingField = $scope.vm.form.issueHostingFields[0];
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
+ || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
issueHostingFields.push({
- id : hostingField.id,
hostingId : $scope.vm.hostingId,
name : $scope.vm.hostingName,
code : $scope.vm.hostingCode,
@@ -805,8 +845,8 @@
// �씠�뒋 �긽�꽭 �젙蹂�
function detail() {
+ $rootScope.spinner = true;
var deferred = $q.defer();
-
Issue.detail($resourceProvider.getContent(
$scope.vm.search,
$resourceProvider.getPageContent(0, 1))).then(function (result) {
@@ -881,10 +921,9 @@
else {
SweetAlert.error($filter("translate")("issue.failedToProjectDetails"), result.data.message.message); // �봽濡쒖젥�듃 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣
}
-
+ $rootScope.spinner = false;
deferred.resolve(result.data.data);
});
-
return deferred.promise;
}
--
Gitblit v1.8.0