From 1f4f82af4e82ceab5a71fe92106bb45e86b100f4 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 18:33:32 +0900
Subject: [PATCH] json 오류 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 7a8041e..01f4279 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -41,6 +41,7 @@
// 蹂��닔
$scope.vm = {
+ issueTypeId : "",
search : {
title : "", // �젣紐�
description : "", // �궡�슜
@@ -465,6 +466,7 @@
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
// $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ $scope.vm.search.issueTypeIds = [];
$scope.vm.search.issueTypeIds.push({
fieldKey : $rootScope.issueTypeMenu.id,
fieldValue : $rootScope.issueTypeMenu.name
@@ -490,10 +492,14 @@
$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);
+ if (result.data.data != null && result.data.data.length > 0) {
+ $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
+ $scope.vm.page.selectedPage = currentPage + 1;
+ $scope.vm.responseData = result.data;
+
+ if (detail) {
+ changeDetailView(result.data.data[0].id);
+ }
}
}
else {
@@ -672,7 +678,13 @@
size : "lg",
controller : 'issueAddTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.issueTypeId
+ };
+ }
+ }
});
}
@@ -811,21 +823,27 @@
}
// �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
+
function getIssueTableConfigs() {
var deferred = $q.defer();
- IssueTableConfig.detail($resourceProvider.getContent({},
- $resourceProvider.getPageContent(0, 1000))).then(function (result) {
- if (result.data.message.status !== "success") {
- SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
- }
+ if ($rootScope.issueTypeMenu != null){
+ var content = {
+ issueTypeId : $rootScope.issueTypeMenu.id
+ }
- deferred.resolve(result.data.data);
- });
+ IssueTableConfig.detail($resourceProvider.getContent(content,
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+ if (result.data.message.status !== "success") {
+ SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
+ }
return deferred.promise;
}
-
// 理쒖큹 �떎�뻾
function startExecute() {
// �뙆�씪誘명꽣 �씫湲�
@@ -833,6 +851,7 @@
if ($rootScope.isDefined(params)) {
$rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
$rootScope.previousGetParams = null;
+ $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
return;
}
@@ -898,6 +917,7 @@
$scope.fn.startExecute();
}
+
]);
}
);
--
Gitblit v1.8.0