From 9e1224315ff031c5cfccda6ccb0d7841729d8612 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 15 11월 2021 17:21:52 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 09e5b4e..9b7b944 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -120,6 +120,7 @@
// �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
function getVmSearchObject() {
+
IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
@@ -239,9 +240,9 @@
.setDAlign("text-center")
.setDName("issueTypeName"));
break;
- case "ASSIGNEE" : // �떞�떦�옄
+ case "ASSIGNEETEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.assignee")
+ .setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -447,6 +448,14 @@
currentPage = selectedPage;
}
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey : $rootScope.issueTypeMenu.id,
+ fieldValue : $rootScope.issueTypeMenu.name
+ });
+ }
// 寃��깋 議곌굔�쓣 ���옣�븳�떎.
//$scope.fn.makeVmSearchObject();
@@ -857,8 +866,8 @@
position : 3,
display : true
}, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEETEAM",
width : "width-140-p",
position : 4,
display : true
--
Gitblit v1.8.0