From 4d692a614bba9d8954cbbdad2d79424afaab0298 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 17:50:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/issue/issueDetail.controller.js |  279 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 189 insertions(+), 90 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 5ef2e16..57f8369 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -51,6 +51,8 @@
                 $scope.fn.containsPartner = containsPartner;
                 $scope.fn.onActivate = onActivate;
                 $scope.fn.issueBack = issueBack;
+                $scope.fn.removeRelationIssue = removeRelationIssue;
+                $scope.fn.removeDownIssue = removeDownIssue;
 
                 //  �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
                 $scope.vm.viewer = {};      // �쁽�옱 �씠�뒋
@@ -110,7 +112,7 @@
                 $scope.vm.relTableConfigs = [];
                 //  �뀒�씠釉� �씠踰ㅽ듃
                 $scope.relTableEvent = {
-                    removeRelationIssue : removeRelationIssue,   // �뿰愿� �씪媛� �궘�젣
+                    //removeRelationIssue : removeRelationIssue,   // �뿰愿� �씪媛� �궘�젣
                     changeDetailView : changeDetailView
                 };
 
@@ -118,7 +120,7 @@
                 $scope.vm.downTableConfigs = [];
                 //  �뀒�씠釉� �씠踰ㅽ듃
                 $scope.downTableEvent = {
-                    removeDownIssue : removeDownIssue,   // �뿰愿� �씪媛� �궘�젣
+                    //removeDownIssue : removeDownIssue,   // �뿰愿� �씪媛� �궘�젣
                     changeDetailView : changeDetailView
                 };
 
@@ -126,13 +128,18 @@
                     //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
                     //$rootScope.$broadcast("makeIssueSearch",issue);
                     $scope.$parent.tableEvent.changeDetailView(issue.id);
+
                     $scope.fn.onActivate();
                 }
 
                 // �긽�쐞 �씠�뒋 �겢由��떆 �긽�쐞 �씠�뒋濡� �씠�룞
                 function issueBack() {
-                    $rootScope.currentDetailIssueId = $scope.vm.viewer.parentIssueVo.id
-                    $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
+                    var index = $scope.$parent.vm.issueIds.length -2;
+                    if (index > -1) {
+                        var preIssueId = $scope.$parent.vm.issueIds[index];
+                        $scope.$parent.vm.issueIds.splice(index + 1, 1);
+                        $scope.$parent.tableEvent.changeDetailView(preIssueId, true);
+                    }
                 }
 
                 function onActivate() {
@@ -147,11 +154,42 @@
                 });
 
                 // �븯�쐞 �씠�뒋 �궘�젣
-                function removeDownIssue(id) {
+                function removeDownIssue() {
+                    var removeIds = [];
+                    var removePermission = true;
+
+                    angular.forEach($scope.vm.viewer.issueDownVos, function (data) {
+                        if (data.checked && data.modifyPermissionCheck) {
+                            removeIds.push(data.id);
+                        }
+
+                        if (data.checked && !data.modifyPermissionCheck) {
+                            removePermission = false;
+                        }
+                    });
+
+                    if (!removePermission) {
+                        SweetAlert.swal({
+                            html : true,
+                            title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
+                            text : $filter("translate")("project.notHaveDeletePermissionExistsProject"), // "�궘�젣 沅뚰븳�씠 �뾾�뒗 �봽濡쒖젥�듃媛� 議댁옱�빀�땲�떎."
+                            type : "error"
+                        });
+                        return;
+                    }
+
+                    if (removeIds.length < 1) {
+                        SweetAlert.swal({
+                            title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+                            text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+                            type : "warning"
+                        });
+                        return;
+                    }
                     //  �궘�젣 �븣由�
                     SweetAlert.swal({
                             title : $filter("translate")("issue.downIssueRemove"), // �븯�쐞 �씠�뒋 �궘�젣
-                            text : $filter("translate")("issue.wantToDeleteSelectIssue"),
+                            text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"),
                             type : "warning",
                             showCancelButton : true,
                             confirmButtonColor : "#DD6B55",
@@ -167,7 +205,7 @@
                                 $rootScope.spinner = true;
 
                                 var contents = {
-                                    id : id
+                                    ids : removeIds
                                 };
 
                                 Issue.modifyParentIssue($resourceProvider.getContent(
@@ -189,7 +227,38 @@
                 }
 
                 // �뿰愿� �씠�뒋 �궘�젣
-                function removeRelationIssue(id) {
+                function removeRelationIssue() {
+                    var removeIds = [];
+                    var removePermission = true;
+
+                    angular.forEach($scope.vm.viewer.issueRelationVos, function (data) {
+                        if (data.checked && data.modifyPermissionCheck) {
+                            removeIds.push(data.id);
+                        }
+
+                        if (data.checked && !data.modifyPermissionCheck) {
+                            removePermission = false;
+                        }
+                    });
+
+                    if (!removePermission) {
+                        SweetAlert.swal({
+                            html : true,
+                            title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
+                            text : $filter("translate")("issue.notHaveDeletePermissionExistsAnIssue"), // �궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋媛� 議댁옱�빀�땲�떎.
+                            type : "error"
+                        });
+                        return;
+                    }
+
+                    if (removeIds.length < 1) {
+                        SweetAlert.swal({
+                            title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+                            text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+                            type : "warning"
+                        });
+                        return;
+                    }
                     //  �궘�젣 �븣由�
                     SweetAlert.swal({
                             title : $filter("translate")("issue.relationIssueRemove"), // �뿰愿� �씠�뒋 �궘�젣
@@ -209,7 +278,7 @@
                                 $rootScope.spinner = true;
 
                                 var contents = {
-                                    id : id
+                                    removeIds : removeIds
                                 };
 
                                 IssueRelation.delete($resourceProvider.getContent(
@@ -244,43 +313,43 @@
 
                     //  �뿰愿� �씠�뒋 而щ읆
                     switch(Rel_issueTableConfig.key) {
-                        // �뿰愿� �씠�뒋 援щ텇
-                        case "RELATION_ISSUE_TYPE" :
+                        case "RELATION_ISSUE_TYPE" :    // �뿰愿� �씠�뒋 援щ텇
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("issue.relationIssueType")
                                 .setDType("renderer")
-                                .setHWidth("width-30 bold")
-                                .setHSort(false)
+                                .setDAlign("text-center")
+                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                 .setDRenderer("ISSUE_RELATION_TYPE"))
+                                /*.setHWidth("width-30 bold")*/
+                                /*.setHSort(false)*/
                             break;
-                        // �뿰愿� �씠�뒋 �젣紐�
-                        case "RELATION_ISSUE_TITLE" :
+                        case "RELATION_ISSUE_TITLE" :   // �뿰愿� �씠�뒋 �젣紐�
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("issue.relationIssueTitle")
                                 .setDType("renderer")
-                                .setHWidth("width-60 bold")
-                                .setHSort(false)
+                                .setDAlign("text-center")
+                                .setHWidth("bold " + Rel_issueTableConfig.width)
                                 .setDRenderer("ISSUE_RELATION_MOVE"))
+                                /*.setHWidth("width-60 bold")*/
+                                /*.setHSort(true)*/
                             break;
-                        case "PRIORITY" :   // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+                        case "RELATION_PRIORITY" :   // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.priority")
-                                .setDName("priorityName")
                                 .setDType("renderer")
                                 .setHWidth("bold " + Rel_issueTableConfig.width)
                                 .setDAlign("text-center")
                                 .setDRenderer("REL_COMMON_PRIORITY"));
                             break;
-                        case "SEVERITY" :   //  �뿰愿� �씠�뒋 以묒슂�룄
+                        case "RELATION_SEVERITY" :   //  �뿰愿� �씠�뒋 以묒슂�룄
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.importance")
-                                .setDName("severityName")
                                 .setDType("renderer")
                                 .setHWidth("bold " + Rel_issueTableConfig.width)
                                 .setDAlign("text-center")
                                 .setDRenderer("REL_COMMON_SEVERITY"));
                             break;
-                        case "ASSIGNEE_TEAM" :   // �뿰愿� �씠�뒋 �떞�떦遺��꽌
+                        case "RELATION_ASSIGNEE_TEAM" :   // �뿰愿� �씠�뒋 �떞�떦遺��꽌
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
                                 .setDType("renderer")
@@ -289,7 +358,7 @@
                                 .setDRenderer("REL_ISSUE_DEPARTMENT"));
                             break;
 
-                        case "REGISTER" :   // �뿰愿� �씠�뒋  �벑濡앹옄
+                        case "RELATION_REGISTER" :   // �뿰愿� �씠�뒋  �벑濡앹옄
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.register")
                                 .setDType("renderer")
@@ -297,7 +366,7 @@
                                 .setDAlign("text-center")
                                 .setDRenderer("REL_REGISTER"));
                             break;
-                        case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
+                        case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.period")
                                 .setDType("renderer")
@@ -305,12 +374,11 @@
                                 .setDAlign("text-center")
                                 .setDRenderer("REL_ISSUE_DUE_DATE"));
                             break;
-                        case "MODIFY_DATE" : // �뿰愿� �씠�뒋  理쒓렐 蹂�寃쎌씪
+                        case "RELATION_MODIFY_DATE" : // �뿰愿� �씠�뒋  理쒓렐 蹂�寃쎌씪
                             $scope.vm.relTableConfigs.push($tableProvider.config()
                                 .setHName("common.lastChangeDate")
                                 .setHWidth("bold " + Rel_issueTableConfig.width)
-                                .setDAlign("text-center")
-                                .setDName("modifyDate"));
+                                .setDAlign("text-center"));
                             break;
                     }
 
@@ -341,8 +409,7 @@
 
                     //  �븯�쐞 �씠�뒋 而щ읆
                     switch(Down_issueTableConfig.key) {
-                        //  �븯�쐞 �씠�뒋 �젣紐�
-                        case "DOWN_ISSUE_TITLE" :
+                        case "DOWN_ISSUE_TITLE" :   //  �븯�쐞 �씠�뒋 �젣紐�
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("issue.downIssueTitle")
                                 .setDType("renderer")
@@ -360,25 +427,23 @@
                                 .setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
                             break;
 
-                        case "PRIORITY" :   // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
+                        case "DOWN_PRIORITY" :   // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.priority")
-                                .setDName("priorityName")
                                 .setDType("renderer")
                                 .setHWidth("bold " + Down_issueTableConfig.width)
                                 .setDAlign("text-center")
                                 .setDRenderer("DOWN_COMMON_PRIORITY"));
                             break;
-                        case "SEVERITY" :   //  以묒슂�룄
+                        case "DOWN_SEVERITY" :   //  以묒슂�룄
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.importance")
-                                .setDName("severityName")
                                 .setDType("renderer")
                                 .setHWidth("bold " + Down_issueTableConfig.width)
                                 .setDAlign("text-center")
                                 .setDRenderer("DOWN_COMMON_SEVERITY"));
                             break;
-                        case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
+                        case "DOWN_ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
                                 .setDType("renderer")
@@ -386,7 +451,7 @@
                                 .setDAlign("text-center")
                                 .setDRenderer("DOWN_ISSUE_DEPARTMENT"));
                             break;
-                        case "REGISTER" :   //  �벑濡앹옄
+                        case "DOWN_REGISTER" :   //  �벑濡앹옄
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.register")
                                 .setDType("renderer")
@@ -394,7 +459,7 @@
                                 .setDAlign("text-center")
                                 .setDRenderer("DOWN_REGISTER"));
                             break;
-                        case "PERIOD" : //  湲곌컙
+                        case "DOWN_PERIOD" : //  湲곌컙
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.period")
                                 .setDType("renderer")
@@ -402,12 +467,11 @@
                                 .setDAlign("text-center")
                                 .setDRenderer("DOWN_ISSUE_DUE_DATE"));
                             break;
-                        case "MODIFY_DATE" : //  理쒓렐 蹂�寃쎌씪
+                        case "DOWN_MODIFY_DATE" : //  理쒓렐 蹂�寃쎌씪
                             $scope.vm.downTableConfigs.push($tableProvider.config()
                                 .setHName("common.lastChangeDate")
                                 .setHWidth("bold " + Down_issueTableConfig.width)
-                                .setDAlign("text-center")
-                                .setDName("modifyDate"));
+                                .setDAlign("text-center"));
                             break;
                     }
 
@@ -436,10 +500,14 @@
                 function makeRelTableConfigs() {
                     $scope.vm.relTableConfigs = [];
                     $scope.vm.relTableConfigs.push($tableProvider.config()
+                        .setDType("checkbox")
+                        .setHWidth("width-20-p")
+                        .setDAlign("text-center"))
+                    $scope.vm.relTableConfigs.push($tableProvider.config()
                         .setHName("issue.relationIssueType")
                         .setDType("renderer")
                         .setDAlign("text-center")
-                        .setHWidth("width-30-p bold")
+                        .setHWidth("width-60-p bold")
                         .setHSort(false)
                         .setDRenderer("ISSUE_RELATION_TYPE"))
                     $scope.vm.relTableConfigs.push($tableProvider.config()
@@ -449,15 +517,16 @@
                         .setHWidth("width-60-p bold")
                         .setHSort(false)
                         .setDRenderer("ISSUE_RELATION_MOVE"))
-                    $scope.vm.relTableConfigs.push($tableProvider.config()
-                        .setHName("issue.relationIssueDelete")
-                        .setDType("renderer")
-                        .setDAlign("text-center")
-                        .setHWidth("width-20-p bold")
-                        .setDRenderer("ISSUE_RELATION_DELETE")
-                        .setHSort(false)
-                        .setDAlign("text-center"))
-
+                    /*if($scope.vm.viewer.modifyPermissionCheck) {
+                        $scope.vm.relTableConfigs.push($tableProvider.config()
+                            .setHName("issue.relationIssueDelete")
+                            .setDType("renderer")
+                            .setDAlign("text-center")
+                            .setHWidth("width-40-p bold")
+                            .setDRenderer("ISSUE_RELATION_DELETE")
+                            .setHSort(false)
+                            .setDAlign("text-center"))
+                    }*/
                     angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
                         //  �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
                         if (Rel_issueTableConfig.display) {
@@ -471,22 +540,26 @@
                 function makeDownTableConfigs() {
                     $scope.vm.downTableConfigs = [];
                     $scope.vm.downTableConfigs.push($tableProvider.config()
+                        .setDType("checkbox")
+                        .setHWidth("width-20-p")
+                        .setDAlign("text-center"))
+                    $scope.vm.downTableConfigs.push($tableProvider.config()
                         .setHName("issue.downIssueTitle")
                         .setDType("renderer")
                         .setDAlign("text-center")
                         .setHWidth("width-60-p bold")
                         .setHSort(false)
                         .setDRenderer("ISSUE_DOWN_MOVE"))
-                    if($scope.vm.viewer.modifyPermissionCheck){
+                    /*if($scope.vm.viewer.modifyPermissionCheck){
                         $scope.vm.downTableConfigs.push($tableProvider.config()
                             .setHName("issue.relationIssueDelete")
                             .setDType("renderer")
                             .setDAlign("text-center")
-                            .setHWidth("width-20-p bold")
+                            .setHWidth("width-40-p bold")
                             .setDRenderer("ISSUE_DOWN_DELETE")
                             .setHSort(false)
                             .setDAlign("text-center"))
-                    }
+                    }*/
 
                     angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
                         //  �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
@@ -516,20 +589,24 @@
                         });
 
                         $scope.vm.relTableConfigs = [];
+    /*                  $scope.vm.relTableConfigs.push($tableProvider.config()
+                           .setHName("issue.relationIssueType")
+                           .setDType("renderer")
+                           .setDAlign("text-center")
+                           .setHWidth("width-30-p bold")
+                           .setHSort(false)
+                           .setDRenderer("ISSUE_RELATION_TYPE"))
                         $scope.vm.relTableConfigs.push($tableProvider.config()
-                            .setHName("issue.relationIssueType")
-                            .setDType("renderer")
-                            .setDAlign("text-center")
-                            .setHWidth("width-30-p bold")
-                            .setHSort(false)
-                            .setDRenderer("ISSUE_RELATION_TYPE"))
+                           .setHName("issue.relationIssueTitle")
+                           .setDType("renderer")
+                           .setDAlign("text-center")
+                           .setHWidth("width-60-p bold")
+                           .setHSort(false)
+                           .setDRenderer("ISSUE_RELATION_MOVE"))*/
                         $scope.vm.relTableConfigs.push($tableProvider.config()
-                            .setHName("issue.relationIssueTitle")
-                            .setDType("renderer")
-                            .setDAlign("text-center")
-                            .setHWidth("width-60-p bold")
-                            .setHSort(false)
-                            .setDRenderer("ISSUE_RELATION_MOVE"))
+                            .setDType("checkbox")
+                            .setHWidth("width-20-p")
+                            .setDAlign("text-center"))
                         angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
                             //  �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
                             if (Rel_issueTableConfig.display) {
@@ -538,14 +615,15 @@
 
                             }
                         });
-                        $scope.vm.relTableConfigs.push($tableProvider.config()
-                            .setHName("issue.relationIssueDelete")
-                            .setDType("renderer")
-                            .setHWidth("width-20-p bold")
-                            .setDRenderer("ISSUE_RELATION_DELETE")
-                            .setHSort(false)
-                            .setDAlign("text-center"))
-
+                        /*if($scope.vm.viewer.modifyPermissionCheck) {
+                            $scope.vm.relTableConfigs.push($tableProvider.config()
+                                .setHName("issue.relationIssueDelete")
+                                .setDType("renderer")
+                                .setHWidth("width-40-p bold")
+                                .setDRenderer("ISSUE_RELATION_DELETE")
+                                .setHSort(false)
+                                .setDAlign("text-center"))
+                        }*/
                     } else {
                         makeRelTableConfigs();
                     }
@@ -566,13 +644,17 @@
                             return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
                         });
                         $scope.vm.downTableConfigs = [];
-                        $scope.vm.downTableConfigs.push($tableProvider.config()
+/*                      $scope.vm.downTableConfigs.push($tableProvider.config()
                             .setHName("issue.downIssueTitle")
                             .setDType("renderer")
                             .setDAlign("text-center")
                             .setHWidth("width-60-p bold")
                             .setHSort(false)
-                            .setDRenderer("ISSUE_DOWN_MOVE"))
+                            .setDRenderer("ISSUE_DOWN_MOVE"))*/
+                        $scope.vm.downTableConfigs.push($tableProvider.config()
+                            .setDType("checkbox")
+                            .setHWidth("width-20-p")
+                            .setDAlign("text-center"))
                         angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
                             //  �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
                             if (Down_issueTableConfig.display) {
@@ -580,14 +662,15 @@
                                 $scope.fn.setDownTableColumn(Down_issueTableConfig);
                             }
                         });
-                        $scope.vm.downTableConfigs.push($tableProvider.config()
-                            .setHName("issue.relationIssueDelete")
-                            .setDType("renderer")
-                            .setHWidth("width-20-p bold")
-                            .setDRenderer("ISSUE_DOWN_DELETE")
-                            .setHSort(false)
-                            .setDAlign("text-center"))
-
+                        /*if($scope.vm.viewer.modifyPermissionCheck) {
+                            $scope.vm.downTableConfigs.push($tableProvider.config()
+                                .setHName("issue.relationIssueDelete")
+                                .setDType("renderer")
+                                .setHWidth("width-40-p bold")
+                                .setDRenderer("ISSUE_DOWN_DELETE")
+                                .setHSort(false)
+                                .setDAlign("text-center"))
+                        }*/
                     } else {
                         makeDownTableConfigs();
                     }
@@ -608,7 +691,6 @@
                         priorityName : $scope.vm.priorityName
                     };
 
-                    $rootScope.spinner = true;
                     IssueRelation.add($resourceProvider.getContent(
                         contents,
                         $resourceProvider.getPageContent(0, 10))).then(function (result) {
@@ -619,7 +701,6 @@
                         else {
                             SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
                         }
-                        $rootScope.spinner = false;
                     });
                 }
 
@@ -631,9 +712,14 @@
                         return;
                     }
 
+                    var ids = [];
+                    if ($scope.vm.form.issuesDown[0].id != null) {
+                        ids.push($scope.vm.form.issuesDown[0].id);
+                    }
+
                     var contents = {
                         issueId : $rootScope.currentDetailIssueId,
-                        id : $scope.vm.form.issuesDown[0].id,
+                        ids : ids,
                         parentIssueId : $rootScope.currentDetailIssueId
                     };
 
@@ -711,6 +797,20 @@
                 }
 
                 function modifyDownIssueStatus() {
+                    var issueIds = [];
+
+                    angular.forEach($scope.vm.viewer.issueDownVos, function (data) {
+                        if (data.checked) {
+                            issueIds.push(data.id);
+                            //$scope.vm.projectId = data.projectId;
+                        }
+                    });
+
+                    if (issueIds.length < 1) {
+                        SweetAlert.warning($filter("translate")("issue.selectionCheck"), $filter("translate")("issue.selectIssueToChangeStatus")); // �꽑�깮 ���긽 �솗�씤, �긽�깭 蹂�寃쏀븷 �씠�뒋瑜� �꽑�깮�븯�꽭�슂.
+                        return;
+                    }
+
                     $uibModal.open({
                         templateUrl : 'views/issue/downIssueModifyStatus.html',
                         size : "md",
@@ -721,7 +821,8 @@
                                 return {
                                     issueTypeId : $scope.vm.viewer.issueTypeVo.id,
                                     issueIds : [$scope.vm.viewer.id],
-                                    downIssues : $scope.vm.viewer.issueDownVos,
+                                    //downIssues : $scope.vm.viewer.issueDownVos,
+                                    downIssues : issueIds,
                                     projectId : $scope.vm.viewer.projectVo.id
                                 };
                             }
@@ -852,13 +953,12 @@
 
                 //  �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
                 function getIssueDetail() {
+                    $rootScope.spinner = true;
                     //  珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
                     $scope.fn.initReload();
-
                     // $scope.fn.getRelTableConfigs();
                     // $scope.fn.getDownTableConfigs();
-                    $rootScope.spinner = true;
-                        Issue.detail($resourceProvider.getContent(
+                    Issue.detail($resourceProvider.getContent(
                         {id : $scope.vm.viewer.id, deep : "02"},
                         $resourceProvider.getPageContent(0, 1))).then(function (result) {
 
@@ -919,7 +1019,6 @@
                                 if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
                                     $rootScope.changeLastProject(result.data.data.projectVo.id);
                                 }
-
                             }
                         }
                         else {

--
Gitblit v1.8.0