From 6a5fb9dcd9fe96d62b5dbbcc2bd48db478706389 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 15:56:22 +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 | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 0a51d11..a0df35a 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 : "", // �궡�슜
@@ -73,9 +74,11 @@
priorities : [], // �슦�꽑 �닚�쐞
severities : [], // 以묒슂�룄
users : [], // �떞�떦�옄
+ departments : [], // �떞�떦遺��꽌
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
- issueTableConfigs : [] // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ parentIssueId : ""
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -102,7 +105,9 @@
search : $scope.vm.search,
projects : $scope.vm.projects,
users : $scope.vm.users,
- registers : $scope.vm.registers
+ departments : $scope.vm.departments,
+ registers : $scope.vm.registers,
+ parentIssueId : $scope.vm.parentIssueId
})
};
@@ -128,9 +133,10 @@
var issueListSearchObject = JSON.parse(result.data.data);
// �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
$scope.vm.search = issueListSearchObject.search;
- /*$scope.vm.users = issueListSearchObject.users;
+ $scope.vm.users = issueListSearchObject.users;
+ $scope.vm.departments = issueListSearchObject.departments;
$scope.vm.projects = issueListSearchObject.projects;
- $scope.vm.registers = issueListSearchObject.registers;*/
+ $scope.vm.registers = issueListSearchObject.registers;
$scope.fn.getPageList(0, true);
} else {
@@ -240,13 +246,13 @@
.setDAlign("text-center")
.setDName("issueTypeName"));
break;
- case "ASSIGNEE" : // �떞�떦�옄
+ case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.assignee")
+ .setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("ISSUE_USER"));
+ .setDRenderer("ISSUE_DEPARTMENT"));
break;
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
@@ -375,6 +381,15 @@
return userIds;
})(),
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+
+ return departmentIds;
+ })(),
registerIds : (function () {
var registerIds = [];
@@ -476,6 +491,7 @@
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
+ $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.page.selectedPage = currentPage + 1;
$scope.vm.responseData = result.data;
if (detail) {
@@ -658,7 +674,13 @@
size : "lg",
controller : 'issueAddTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.issueTypeId
+ };
+ }
+ }
});
}
@@ -866,8 +888,8 @@
position : 3,
display : true
}, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEE_TEAM",
width : "width-140-p",
position : 4,
display : true
--
Gitblit v1.8.0