From 255cb7f4d30b6762480427253dee33f0e6b61d77 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 09 12월 2021 14:31:25 +0900 Subject: [PATCH] 프로젝트 이름 클릭시 이슈리스트로 이동 --- src/main/webapp/scripts/app/project/projectList.controller.js | 22 +++------------------- src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 13 ++++--------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js index 136f3c5..beb4f8c 100644 --- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js +++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js @@ -75,13 +75,9 @@ // �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜) case "PROJECT_NAME" : if ($rootScope.workProject != null && $rootScope.workProject.id == scope.data.id) { - // makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; - makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.moveIssue(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; - // makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeDetailView(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; + makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; } else { - // makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; - makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.moveIssue(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; - // makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeDetailView(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; + makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>"; } break; @@ -306,7 +302,6 @@ // �븯�쐞 �씠�뒋 �씠�룞(�젣紐�) case "ISSUE_DOWN_MOVE" : - makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data)\">" + scope.data.title + "</span></a>"; break; @@ -429,8 +424,8 @@ makeTag += '<span class="number-tag">' + scope.data.projectKey + ' - ' + scope.data.issueNumber + '</span>'; makeTag += ' <span class="tag"> / </span> '; makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.issueStatusColor + "\"," + "\"border-color\"" + " : \"" + scope.data.issueStatusColor + "\", \"color\": \"#FFFFFF\" }'>" + scope.data.issueStatusName + "</span>"; - // makeTag += ' <span class="tag"> / </span> '; - // makeTag += '<span class="tag">' + scope.data.projectName + '</span>'; + makeTag += '<span class="tag"> / </span> '; + makeTag += '<span class="tag">' +'<span>API: </span>' + scope.data.isApi + '</span>'; makeTag += '</div>'; makeTag += '<div class="titlename cursor text-left" ng-click="event.changeDetailView(data.id)">' + scope.data.title.replace(/</gi, '<') + '</div>'; makeTag += '<div class="extra-infodiv text-left">'; diff --git a/src/main/webapp/scripts/app/project/projectList.controller.js b/src/main/webapp/scripts/app/project/projectList.controller.js index 9fb34d2..93e08bc 100644 --- a/src/main/webapp/scripts/app/project/projectList.controller.js +++ b/src/main/webapp/scripts/app/project/projectList.controller.js @@ -69,9 +69,7 @@ $scope.tableEvent = { modify : modify, projectCustomFieldConfig : projectCustomFieldConfig, - changeLastProject : changeLastProject, - moveIssue : moveIssue, - changeDetailView : changeDetailView + changeLastProject : changeLastProject }; angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); @@ -363,22 +361,8 @@ } function changeLastProject(projectId) { - $rootScope.changeLastProject(projectId); - } - - function moveIssue(projectId) { - // $rootScope.currentDetailIssueId = null; - // �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎. - // $rootScope.$broadcast("makeIssueSearch", {id :$rootScope.currentDetailIssueId}); - //$rootScope.$broadcast("makeIssueSearch", {id :$rootScope.issueTypeMenu.id}); - $rootScope.$broadcast("makeIssueSearch",projectId); - } - - function changeDetailView() { - // $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId}); - //$scope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId}); - // $rootScope.$broadcast("getIssueDetail", {id :$rootScope.currentDetailIssueId}); - //$rootScope.$broadcast("getIssueList", {id :$rootScope.issueTypeMenu.id}); + //$rootScope.changeLastProject(projectId); + $state.go("issues.list") } $scope.fn.makeTableConfigs(); -- Gitblit v1.8.0