OWL ITS + 탐지시스템(인터넷 진흥원)
wyu
2021-12-10 178ec32fd4ca26d82119ad161b1ad657b01d2c20
대시보드 이슈 클릭시 이슈 상세로 이동 수정
3개 파일 변경됨
27 ■■■■ 파일 변경됨
src/main/resources/mybatis/query-template/issue-template.xml 4 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/resources/mybatis/query-template/widget-template.xml 18 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/common/common.controller.js 5 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/resources/mybatis/query-template/issue-template.xml
@@ -196,7 +196,9 @@
                </foreach>
            </when>
        </choose>
        AND issue.parent_issue_id IS NULL
        <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
            AND issue.parent_issue_id IS NULL
        </if>
        AND issue.reverse_index <![CDATA[ < ]]> 0
        AND workspace.id = #{workspaceId}
        GROUP BY issue.id
src/main/resources/mybatis/query-template/widget-template.xml
@@ -695,6 +695,7 @@
        select
        distinct i.id as id,
        i.title as title,
        i.issue_type_id as issueTypeId,
        p.name as projectName,
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
        p.project_key as projectKey,
@@ -815,7 +816,8 @@
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
        i.issue_number as issueNumber,
        p.project_key as projectKey,
        p.name as projectName
        p.name as projectName,
        i.issue_type_id as issueTypeId
        from issue i
        inner join issue_risk ir on ir.issue_id = i.id
        inner join issue_status iss on iss.id = i.issue_status_id
@@ -874,6 +876,7 @@
            , i.issue_number as issueNumber
            , p.project_key as projectKey
            , CONCAT(p.project_key, '-', i.issue_number) AS issueKey
            , i.issue_type_id as issueTypeId
        </if>
        FROM issue i
        <if test="page != null and !page.equals('')">
@@ -943,6 +946,7 @@
            , iss.name as issueStatusName
            , i.issue_number as issueNumber
            , p.project_key as projectKey
            , i.issue_type_id as issueTypeId
            , CONCAT(p.project_key, '-', i.issue_number) AS issueKey
        </if>
        FROM issue i
@@ -1009,7 +1013,8 @@
            </when>
        </choose>
        ,p.id,
        p.name as projectName
        p.name as projectName,
        i.issue_type_id as issueTypeId
        from issue i
        inner join project p on p.id = i.project_id
        inner join issue_status iss on iss.id = i.issue_status_id
@@ -1036,7 +1041,8 @@
            </when>
        </choose>
        ,p.id,
        p.name as projectName
        p.name as projectName,
        i.issue_type_id as issueTypeId
        from issue i
        inner join project p on p.id = i.project_id
        inner join issue_status iss on iss.id = i.issue_status_id
@@ -1421,7 +1427,8 @@
        p.project_key AS projectKey,
        p.name AS projectName,
        iss.name AS issueStatusName,
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
        i.issue_type_id as issueTypeId
        FROM issue i
        INNER JOIN project p ON p.id = i.project_id
        INNER JOIN workspace w ON w.id = p.workspace_id
@@ -1455,7 +1462,8 @@
        p.project_key AS projectKey,
        p.name AS projectName,
        iss.name AS issueStatusName,
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey
        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
        i.issue_type_id as issueTypeId
        FROM issue i
        INNER JOIN project p ON p.id = i.project_id
        INNER JOIN workspace w ON w.id = p.workspace_id
src/main/webapp/scripts/app/common/common.controller.js
@@ -37,7 +37,7 @@
                //  시스템에서 특정 이슈로 바로 이동할 수 있도록 해준다.
                $scope.$on("makeIssueSearch", function (event, args) {
                    //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
                });
                // 이슈 유형 변경시
@@ -118,7 +118,7 @@
                }
                //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
                function makeIssueSearch(projectKey, issueNumber) {
                function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
                    var combinationIssueNumber = projectKey;
                    if (issueNumber != undefined) {
                        combinationIssueNumber += "-" + issueNumber;
@@ -136,6 +136,7 @@
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.fn.changeIssueListMenu(issueTypeId);
                            moveMenu("issues.list");
                        } else {
                            SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "검색 필드 조건 저장 실패"