Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-20 04221a915d740bfef444c9ab34d79964f8630cdc

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

 src/main/webapp/assets/styles/main.css

@@ -4855,6 +4855,11 @@
    background-color: #34bfa3;
}

.badge-department {
    color: #fff;
    background-color: #8d2b9b;
}

/*.badge-success[href]:hover, .badge-success[href]:focus {
  color: #fff;
  text-decoration: none;

 src/main/webapp/i18n/ko/global.json

@@ -893,6 +893,8 @@
        "failedToApiTokenAdd" : "API 토큰 생성 실패",
        "useIssueStatus" : "사용 가능한 이슈 상태",
        "successToApiTokenRemove" : "API 토큰 삭제 성공",
        "successToApiTokenCopy" : "API 토큰 복사 성공",
        "ApiTokenCopy" : "토큰 복사",
        "successToApiTokenAdd" : "API 토큰 생성 성공",
        "successToApiIssueDefault" : "기본값 설정 완료",
        "failedToApiIssueDefault" : "기본값 설정 실패",

 src/main/webapp/scripts/app/api/apiAuth.controller.js

@@ -14,7 +14,8 @@
                    formSubmit : formSubmit,
                    remove : remove,
                    find : find,
                    formCheck : formCheck
                    formCheck : formCheck,
                    copyToken : copyToken
                };

                $scope.vm = {
@@ -74,6 +75,17 @@
                    });
                }

                function copyToken() {
                    var copyText = document.getElementById("apiApplicationForm2");

                    copyText.select();
                    copyText.setSelectionRange(0, 99999);

                    navigator.clipboard.writeText(copyText.value);

                    SweetAlert.swal($filter("translate")("api.successToApiTokenCopy")); // "api 토큰 생성 성공"
                }

                function find() {
                    var conditions = {
                        appName : $scope.vm.form.appName

 src/main/webapp/views/api/apiAuth.html

@@ -45,6 +45,7 @@
                                ng-disabled="fn.formCheck(apiTokenAddForm.$invalid)"
                                ng-click="fn.formSubmit()"><span translate="api.create">생성</span>
                    </button>
                    <button type="button" class="btn btn-md btn-grey float-right" ng-click="fn.copyToken()"><span translate="api.ApiTokenCopy">토큰 복사</span></button>
                </div>
            </div>
        </div>

 src/main/webapp/views/common/sidebar.html

@@ -186,7 +186,7 @@
    <div class="logged-user-w avatar-inline">
        <div class="row mb-1" ng-if="$root.myLevel != null" >
            <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.myLevel}}</span>
            <span class="issue-main-label offset-detail-1 badge badge-success">{{$root.myDepartments}}</span>
            <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.myDepartments}}</span>
        </div>
        <div class="logged-user-i">
            <div class="avatar-w">

 src/main/webapp/views/issue/issueDetail.html

@@ -109,6 +109,9 @@
                   ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="이슈 발생 예약 하기"></i>
                <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-skip-back" 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>
        </div>