From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/companyField/companyFieldList.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index b4d6165..936b537 100644
--- a/src/main/webapp/views/companyField/companyFieldList.html
+++ b/src/main/webapp/views/companyField/companyFieldList.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="companyField.add">�뾽泥� �깮�꽦</span>
</button>
@@ -64,10 +64,10 @@
</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="/companyField/downloadExcel"
- name="companyFieldList">
+ name="companyFieldListForm">
<input type="hidden" name="conditions">
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
@@ -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="companyFieldList" 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>
--
Gitblit v1.8.0