From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/companyField/companyFieldList.html | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index d1a5d7c..3e86337 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>
@@ -13,20 +13,20 @@
<div class="row">
<div class="col-sm-12">
<div class="searchdiv">
- <form name="customFieldListForm" role="form" ng-enter="fn.getPageList(0)">
+ <form name="companyFieldListForm" role="form" ng-enter="fn.getPageList(0)">
<div class="row">
<div class="col-lg-3">
<div class="form-group">
- <label for="customFieldListForm1"><span translate="companyField.name">�궗�슜�옄 �젙�쓽 �븘�뱶 紐�</span></label>
+ <label for="companyFieldListForm1"><span translate="companyField.name">�뾽泥대챸</span></label>
<input type="text"
name="name"
- id="customFieldListForm1"
+ id="companyFieldListForm1"
autocomplete="off"
maxlength="15"
kr-input
owl-auto-focus
class="form-control"
- ng-model="vm.search.name" placeholder="{{'customField.pleaseEnterUserDefinedFieldName' | translate}}">
+ ng-model="vm.search.name" placeholder="{{'companyField.pleaseEnterCompanyFieldName' | translate}}">
</div>
</div>
@@ -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="/customField/downloadExcel"
- name="customFieldListForm">
+ action="/companyField/downloadExcel"
+ name="companyFieldListForm">
<input type="hidden" name="conditions">
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
@@ -76,7 +76,7 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" form-submit="companyFieldListForm" 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>
</div>
</div>
--
Gitblit v1.8.0