OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2021-12-28 743fb98986d528be8b3b5bfd6d99fb1cabcd82b9
Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
3개 파일 변경됨
15 ■■■■■ 파일 변경됨
src/main/webapp/scripts/app/issue/issueAdd.controller.js 5 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/common/header.html 8 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueDetail.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -665,6 +665,7 @@
                        fileFormDataName : "file"
                    }).then(function (result) {
                        if (result.data.message.status === "success") {
                            //  연속 등록 체크시 이동하지 않음.
                            if ($scope.vm.infiniteAdd) {
                                $scope.fn.infiniteAddForm();
@@ -673,7 +674,9 @@
                                $scope.fn.cancel();
                                if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                                    $state.go("issues.list");
                                    $state.go($state.current, {}, {reload : true});
                                    // $state.go("issues.list");
                                    // $state.go("dashboards.dashboard")
                                }
                            }
src/main/webapp/views/common/header.html
@@ -76,14 +76,14 @@
            -->
            <select class="form-control rounded width-80-p"
<!--            <select class="form-control rounded width-80-p"
                    ng-model="$root.language"
                    tabindex="-1"
                    ng-change="$root.changeLocale($root.language)">
                <option value="ko" translate="common.korean">
                    한국어
                </option>
                <!--<option value="en" translate="common.english">
                <option value="en" translate="common.english">
                    영어
                </option>
                <option value="ja" translate="common.japaneseLanguage">
@@ -91,8 +91,8 @@
                </option>
                <option value="vi" translate="common.vietnamese">
                    베트남어
                </option>-->
            </select>
                </option>
            </select>-->
        </div>
    </div>
</div>
src/main/webapp/views/issue/issueDetail.html
@@ -109,7 +109,7 @@
                <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
                   ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i>
                <!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 -->
                <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="이슈 뒤로 이동"></i></span>
<!--                <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="이슈 뒤로 이동"></i></span>-->
                <!-- 상위 이슈가 있을때 상세화면 닫기버튼 위치 조정 -->
                <span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="상세 화면 닫기"></i></span>
            </a>