From e13780214d7911af890e8014617789d0b273509a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 09:56:37 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 4 ++--
src/main/webapp/views/companyField/companyFieldList.html | 4 ++--
src/main/webapp/views/ispField/ispFieldList.html | 4 ++--
src/main/webapp/views/hostingField/hostingFieldList.html | 4 ++--
src/main/webapp/views/project/projectListNormal.html | 4 ++--
src/main/webapp/views/issue/issueListNormal.html | 4 ++--
src/main/webapp/views/issueStatus/issueStatusList.html | 4 ++--
src/main/webapp/views/workspace/workspaceDepartmentConfig.html | 4 ++--
src/main/webapp/i18n/ko/global.json | 2 ++
src/main/webapp/views/customField/customFieldList.html | 4 ++--
src/main/webapp/views/issueType/issueTypeList.html | 4 ++--
src/main/webapp/views/notice/noticeList.html | 4 ++--
src/main/webapp/views/workflow/workflowList.html | 4 ++--
13 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index a83b91f..8ee3ce8 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -701,9 +701,11 @@
"add": "異붽�",
"addFunction": "異붽�湲곕뒫",
"downloadExcel": "�뿊�� �떎�슫濡쒕뱶",
+ "allDownloadExcel": "�뿊�� �쟾泥� �떎�슫濡쒕뱶",
"importExcel": "Excel Import",
"registerExcelUploadIssue": "�뿊�� �뾽濡쒕뱶 �씠�뒋 �벑濡�",
"delete": "�궘�젣",
+ "selectDelete": "�꽑�깮 �빆紐� 紐⑤몢 �궘�젣",
"checkPurgingTargets": "�궘�젣 ���긽 �솗�씤",
"selectDestinationDeletion": "�궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.",
"deleteFailed": "�궘�젣 �떎�뙣",
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index 3e86337..936b537 100644
--- a/src/main/webapp/views/companyField/companyFieldList.html
+++ b/src/main/webapp/views/companyField/companyFieldList.html
@@ -76,8 +76,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/customField/customFieldList.html b/src/main/webapp/views/customField/customFieldList.html
index 0328c0f..535d78d 100644
--- a/src/main/webapp/views/customField/customFieldList.html
+++ b/src/main/webapp/views/customField/customFieldList.html
@@ -87,8 +87,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/hostingField/hostingFieldList.html b/src/main/webapp/views/hostingField/hostingFieldList.html
index fd1bcb4..d7cb4e6 100644
--- a/src/main/webapp/views/hostingField/hostingFieldList.html
+++ b/src/main/webapp/views/hostingField/hostingFieldList.html
@@ -76,8 +76,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="hostingFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="hostingFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/ispField/ispFieldList.html b/src/main/webapp/views/ispField/ispFieldList.html
index e40f4e0..ac9e275 100644
--- a/src/main/webapp/views/ispField/ispFieldList.html
+++ b/src/main/webapp/views/ispField/ispFieldList.html
@@ -76,8 +76,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="ispFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="ispFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index a903afe..5c2e06a 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -439,12 +439,12 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start" >
- <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.importExcel()"> <span translate="common.importExcel">Excel Import</span></a>
<a class="dropdown-item cursor" ng-click="fn.modifyMultiIssueStatus()"> <span translate="common.updateIssueStatus">�씠�뒋 �긽�깭 蹂�寃�</span></a>
<a class="dropdown-item cursor" ng-click="fn.addIssueTableConfig()"> <span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/issueStatus/issueStatusList.html b/src/main/webapp/views/issueStatus/issueStatusList.html
index 012c43a..186048c 100644
--- a/src/main/webapp/views/issueStatus/issueStatusList.html
+++ b/src/main/webapp/views/issueStatus/issueStatusList.html
@@ -94,9 +94,9 @@
x-placement="bottom-start">
<a class="dropdown-item cursor" form-submit="issueStatusListForm"
make-search-conditions="fn.makeSearchConditions()">
- <span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.removes()"> <span
- translate="common.delete">�궘�젣</span></a>
+ translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/issueType/issueTypeList.html b/src/main/webapp/views/issueType/issueTypeList.html
index 7621cf9..6a5eab2 100644
--- a/src/main/webapp/views/issueType/issueTypeList.html
+++ b/src/main/webapp/views/issueType/issueTypeList.html
@@ -76,8 +76,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="issueTypeListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="issueTypeListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/notice/noticeList.html b/src/main/webapp/views/notice/noticeList.html
index 317d921..647b438 100644
--- a/src/main/webapp/views/notice/noticeList.html
+++ b/src/main/webapp/views/notice/noticeList.html
@@ -90,8 +90,8 @@
<button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
- <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete" class="ng-scope">�궘�젣</span></a>
</div>
</div>
diff --git a/src/main/webapp/views/project/projectListNormal.html b/src/main/webapp/views/project/projectListNormal.html
index cc4558e..329f0e4 100644
--- a/src/main/webapp/views/project/projectListNormal.html
+++ b/src/main/webapp/views/project/projectListNormal.html
@@ -91,9 +91,9 @@
x-placement="bottom-start">
<a class="dropdown-item cursor" form-submit="projectListForm"
make-search-conditions="fn.makeSearchConditions()"><span
- translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.removes()"> <span
- translate="common.delete">�궘�젣</span></a>
+ translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
diff --git a/src/main/webapp/views/workflow/workflowList.html b/src/main/webapp/views/workflow/workflowList.html
index 7a8c2cb..ef653c5 100644
--- a/src/main/webapp/views/workflow/workflowList.html
+++ b/src/main/webapp/views/workflow/workflowList.html
@@ -78,8 +78,8 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="workflowListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" form-submit="workflowListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index f2ad479..eab49e3 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -51,8 +51,8 @@
<button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
- <a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removeDepartments()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeDepartments()"> <span translate="common.selectDelete" class="ng-scope">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 4a07b96..d040258 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -51,8 +51,8 @@
<button aria-expanded="false" aria-haspopup="true" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><span translate="common.addFunction" class="ng-scope">異붽�湲곕뒫</span>
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
- <a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ <a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.selectDelete" class="ng-scope">�궘�젣</span></a>
</div>
</div>
</form>
--
Gitblit v1.8.0