From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/webapp/views/hostingField/hostingFieldList.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/hostingField/hostingFieldList.html b/src/main/webapp/views/hostingField/hostingFieldList.html
index 8c9ac52..5441814 100644
--- a/src/main/webapp/views/hostingField/hostingFieldList.html
+++ b/src/main/webapp/views/hostingField/hostingFieldList.html
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-sm-12">
<div class="element-wrapper">
- <div class="element-actions" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')">
+ <div class="element-actions" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<button ng-click="fn.add()"
class="btn btn-xlg btn-danger"><i class="os-icon os-icon-plus"></i> <span translate="hostingField.add">�뾽泥� �깮�꽦</span>
</button>
@@ -64,7 +64,7 @@
</label>
</div>
</div>
- <div class="col-5 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')">
+ <div class="col-5 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<form class="form-inline justify-content-sm-end pull-right" method="post"
action="/hostingField/downloadExcel"
name="hostingFieldListForm">
@@ -76,8 +76,9 @@
</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" ng-click="fn.importExcel()"> <span translate="common.importExcel">Excel Import</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>
@@ -86,7 +87,7 @@
</div>
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
+ <js-table style="word-break: break-word" data="vm.responseData.data" table-configs="vm.tableConfigs" event="tableEvent"></js-table>
</div>
<div class="controls-below-table text-center">
--
Gitblit v1.8.0