From 279c4135ea0c0655b4c5b5b54f6340a5f80744f5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 17:13:44 +0900
Subject: [PATCH] 부서 설정 변경[프론트]
---
src/main/webapp/views/issue/issueModifyUser.html | 2 +-
src/main/webapp/views/issue/issueAdd.html | 10 +++++-----
src/main/webapp/views/issue/issueListNormal.html | 2 +-
src/main/webapp/i18n/ko/global.json | 1 +
src/main/webapp/views/issue/issueModify.html | 2 +-
src/main/webapp/views/issue/issueDetail.html | 2 +-
src/main/webapp/views/common/sidebar.html | 2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index feba252..b546364 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -807,6 +807,7 @@
"emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
"emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
"emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
+ "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �봽濡쒖젥�듃 �꽕�젙�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
"noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
"emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
"emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 29c5235..dc2ede4 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -325,7 +325,7 @@
<span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<span>LIST MANAGEMENT</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 1fcfcd2..1a05cff 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -128,7 +128,7 @@
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment'}"
+ 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">
@@ -278,7 +278,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="vm.viewer.useCompanyVo[0].name == '�뾽泥�'" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
@@ -362,7 +362,7 @@
</div>
</div>
<p></p>
- <div class="row">
+ <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
@@ -468,7 +468,7 @@
</div>
</div>
<p></p>
- <div class="row">
+ <div ng-show="vm.viewer.useCompanyVo[0].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[1].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[2].name == '�샇�뒪�똿'" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span>
<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
@@ -476,7 +476,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="vm.viewer.useCompanyVo[0].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[1].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[2].name == '�샇�뒪�똿'" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 532e0ec..2bf7a65 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -290,7 +290,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
+ <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
<div class="col-sm-2">
<div class="form-group">
<h6 class="info_font" translate="ispField.info">ISP�젙蹂�</h6>
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index f11e161..1c7da54 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -191,7 +191,7 @@
search="vm.departmentName"
input-disabled="false"
source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment' }"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
</js-autocomplete-multi>
</div>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index aa4b2a4..8166025 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -128,7 +128,7 @@
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment'}"
+ 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/issueModifyUser.html b/src/main/webapp/views/issue/issueModifyUser.html
index 6ac4acf..e1c34b8 100644
--- a/src/main/webapp/views/issue/issueModifyUser.html
+++ b/src/main/webapp/views/issue/issueModifyUser.html
@@ -20,7 +20,7 @@
total-page="vm.autoCompletePage.user.totalPage"
source="fn.getUserList(vm.userName, vm.form.users, vm.autoCompletePage.user.page, fn.getUserListCallBack)"
input-disabled="vm.form.users.length == 0"
- translation-texts="{ empty : 'common.emptyDepartment'}"
+ translation-texts="{ empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile',
type : 'user', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
--
Gitblit v1.8.0