From d348049a4a3c9fa32c3eb566c69df6d8adf652a8 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 01:57:02 +0900
Subject: [PATCH] 이슈 상세 유형별 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 42f532e..cb2300e 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
- '$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'IssueTableConfig', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
+ '$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'HostingField', 'IssueTableConfig', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, HostingField, IssueTableConfig, $filter) {
// IssueListController vm, fn 蹂��닔 �긽�냽.
@@ -42,9 +42,10 @@
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
+ $scope.fn.getPartners = getPartners;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
- $scope.vm.viewer = {};
+ $scope.vm.viewer = [];
$scope.vm.images = []; // 泥⑤��맂 �뙆�씪 以� �씠誘몄� �뙆�씪
$scope.vm.activeTab = "ALL"; // �솢�룞 �궡�뿭 �꺆
// �씠�뒋 �긽�깭 蹂�寃� �몴�떆 �뿬遺�
@@ -782,21 +783,6 @@
});
}
- // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
- function containsPartner(name) {
- var result = false;
-
- if ($scope.vm.viewer.usePartnerVo != null) {
- $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
- if (name === partnerVo.name) {
- result = true;
- }
- });
- }
- return result;
-
- }
-
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
function getIssueDetail() {
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
@@ -812,6 +798,7 @@
if (result.data.message.status === "success") {
if (angular.isDefined(result.data.data)) {
$scope.vm.viewer = angular.copy(result.data.data);
+
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
$scope.fn.makePreviewImages(result.data.data.attachedFileVos);
// �솢�룞 �씠�젰 留뚮뱾湲�
@@ -853,8 +840,25 @@
});
}
+
// ===================================================================================
+ // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
+ function containsPartner(name) {
+ var result = false;
+ // �씪�떒 viewer瑜� 留⑥쐞�뿉 �꽑�뼵�빐 {} �씠�젃寃� �꽑�뼵�빐 �몢�뿀�뒗�뜲 媛믩뱾�씠 �뼱�뼡�떇�쑝濡� 蹂��솚�씠 �맟�뒗吏��뒗
+ // 紐곕씪�꽌 諛곗뿴濡� �꽆�뼱���꽌 珥덇린媛믪쓣 諛곗뿴濡� 諛붽씀�뿀�뜑�땲 �씠�뒋 �긽�꽭�뿉�꽌�뒗 蹂댁씤�떎
+ // �씠�젣 �씠�뒋 異붽��뿉�꽌 媛믪씠 �뼱�뼸寃� �꽆�뼱�삤�뒗吏� �솗�씤�빐蹂댁옄!
+ if ($scope.vm.viewer.usePartnerVos != null) {
+ $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
+ if (name === partnerVo.name) {
+ result = true;
+ }
+ });
+ }
+ return result;
+
+ }
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
function makePreviewImages(attachedFileVos) {
// 誘몃━蹂닿린 �씠誘몄� 珥덇린�솕
@@ -1031,6 +1035,18 @@
});
}
+ function getPartners() {
+
+ HostingField.getPartnerList($resourceProvider.getContent(
+ {},
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+ if (result.data.message.status === "success") {
+ $scope.vm.partnerVos = result.data.data.usePartnerVos;
+ }
+ });
+
+ }
+
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
function sendMail(issueId, projectId) {
$uibModal.open({
--
Gitblit v1.8.0