From b1834429716953b4d15b1f98e791c453e7f6d6dc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 11:38:14 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueModifyDepartment.html | 2 +-
src/main/webapp/views/workspace/workspaceUserDepartmentModify.html | 2 +-
src/main/webapp/views/issue/downIssueModifyStatus.html | 2 +-
src/main/webapp/views/issue/issueModifyStatus.html | 2 +-
src/main/webapp/views/issueType/issueTypeAdd.html | 2 +-
src/main/webapp/views/project/projectAdd.html | 2 +-
src/main/webapp/views/project/projectModify.html | 2 +-
src/main/webapp/views/issueType/issueTypeModify.html | 2 +-
src/main/webapp/i18n/ko/global.json | 3 ++-
src/main/webapp/assets/styles/main.css | 3 ++-
10 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index baf6003..b356377 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -5223,8 +5223,9 @@
height: 150px
}
}*/
+
.modal-open {
- overflow: hidden;
+ overflow: auto;
}
.modal {
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index e2a74f8..4fc527d 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -839,8 +839,9 @@
"emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
"emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
"emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
- "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+ "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br>遺��꽌 愿�由ъ뿉�꽌 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
"noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
+ "emptyCompanyPartners": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥� �젙蹂닿� �뾾�뒿�땲�떎.",
"emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
"emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
"emptyIsp": "�꽑�깮�븷 �닔 �엳�뒗 ISP媛� �뾾�뒿�땲�떎.",
diff --git a/src/main/webapp/views/issue/downIssueModifyStatus.html b/src/main/webapp/views/issue/downIssueModifyStatus.html
index 5876cfa..c60a510 100644
--- a/src/main/webapp/views/issue/downIssueModifyStatus.html
+++ b/src/main/webapp/views/issue/downIssueModifyStatus.html
@@ -37,7 +37,7 @@
search="vm.departmentName"
source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
diff --git a/src/main/webapp/views/issue/issueModifyDepartment.html b/src/main/webapp/views/issue/issueModifyDepartment.html
index 204ecaf..2beb3c1 100644
--- a/src/main/webapp/views/issue/issueModifyDepartment.html
+++ b/src/main/webapp/views/issue/issueModifyDepartment.html
@@ -18,7 +18,7 @@
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issue/issueModifyStatus.html b/src/main/webapp/views/issue/issueModifyStatus.html
index 1e97429..671b6de 100644
--- a/src/main/webapp/views/issue/issueModifyStatus.html
+++ b/src/main/webapp/views/issue/issueModifyStatus.html
@@ -37,7 +37,7 @@
search="vm.departmentName"
source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
diff --git a/src/main/webapp/views/issueType/issueTypeAdd.html b/src/main/webapp/views/issueType/issueTypeAdd.html
index e496304..045df01 100644
--- a/src/main/webapp/views/issueType/issueTypeAdd.html
+++ b/src/main/webapp/views/issueType/issueTypeAdd.html
@@ -65,7 +65,7 @@
search="vm.companyName"
source="fn.getPartnerList(vm.companyName, vm.form.companies)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyCompanyPartners' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issueType/issueTypeModify.html b/src/main/webapp/views/issueType/issueTypeModify.html
index ccf2123..46e76e4 100644
--- a/src/main/webapp/views/issueType/issueTypeModify.html
+++ b/src/main/webapp/views/issueType/issueTypeModify.html
@@ -70,7 +70,7 @@
search="vm.companyName"
source="fn.getPartnerList(vm.companyName, vm.form.companies)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyCompanyPartners' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index 82b6cdc..d9933ff 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -139,7 +139,7 @@
search="vm.departmentName"
source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/project/projectModify.html b/src/main/webapp/views/project/projectModify.html
index 6cc203b..d280b60 100644
--- a/src/main/webapp/views/project/projectModify.html
+++ b/src/main/webapp/views/project/projectModify.html
@@ -112,7 +112,7 @@
search="vm.departmentName"
source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
diff --git a/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
index 9c454b3..b3f3021 100644
--- a/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
@@ -17,7 +17,7 @@
search="vm.departmentName"
source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
--
Gitblit v1.8.0