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/workspace/workspaceDepartmentConfig.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index f2ad479..6b2ab8d 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -34,7 +34,7 @@
<label>
<select name="pageRow"
class="form-control form-control-sm"
- ng-change="fn.changePageRowCount()"
+ ng-change="fn.changeDepartmentPageRowCount()"
ng-model="vm.page.selectedPageRowCount">
<option value="10">10</option>
<option value="50">50</option>
@@ -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>
--
Gitblit v1.8.0