From 04221a915d740bfef444c9ab34d79964f8630cdc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 20 12월 2021 18:00:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/api/apiAuth.html | 1 +
src/main/webapp/i18n/ko/global.json | 2 ++
src/main/webapp/scripts/app/api/apiAuth.controller.js | 14 +++++++++++++-
src/main/webapp/views/issue/issueDetail.html | 3 +++
src/main/webapp/assets/styles/main.css | 5 +++++
src/main/webapp/views/common/sidebar.html | 2 +-
6 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index e11c3e7..db6b721 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/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;
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 89bc71d..2d9bbd3 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -893,6 +893,8 @@
"failedToApiTokenAdd" : "API �넗�겙 �깮�꽦 �떎�뙣",
"useIssueStatus" : "�궗�슜 媛��뒫�븳 �씠�뒋 �긽�깭",
"successToApiTokenRemove" : "API �넗�겙 �궘�젣 �꽦怨�",
+ "successToApiTokenCopy" : "API �넗�겙 蹂듭궗 �꽦怨�",
+ "ApiTokenCopy" : "�넗�겙 蹂듭궗",
"successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�",
"successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",
"failedToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �떎�뙣",
diff --git a/src/main/webapp/scripts/app/api/apiAuth.controller.js b/src/main/webapp/scripts/app/api/apiAuth.controller.js
index fb542b1..eda67ae 100644
--- a/src/main/webapp/scripts/app/api/apiAuth.controller.js
+++ b/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
diff --git a/src/main/webapp/views/api/apiAuth.html b/src/main/webapp/views/api/apiAuth.html
index 21c7a6e..0bebb25 100644
--- a/src/main/webapp/views/api/apiAuth.html
+++ b/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>
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 73a3c59..8b702cc 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/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">
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 29da70c..ecc2de2 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/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>
--
Gitblit v1.8.0