From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 화, 15 3월 2022 12:12:17 +0900 Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가 --- src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html index 6454cb8..d9e25af 100644 --- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html +++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html @@ -2,18 +2,18 @@ <div class="col-lg-12"> <div class="element-box"> <div class="searchdiv"> - <form name="userWorkspaceForm" role="form" ng-enter="fn.getUserWorkspaceList(0)"> + <form name="userLevelForm" role="form" ng-enter="fn.getUserLevelList(0)"> <div class="row"> - <div class="col-xl-4"> - <div class="form-group" style="margin-left: 50px"> + <div class="col-xl-2"> + <div class="form-group"> <label translate="managementWorkspace.levelName">�벑湲됰챸</label> <input class="form-control" type="text" ng-click="" ng-model="vm.search.levelName" maxlength="50"> </div> </div> - <div class="col-xl-5"> + <div class="col-xl-4"> <div class="form-group form-buttons-w2"> - <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(vm.page.selectedPage-1)"> + <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(0)"> <i class="os-icon os-icon-ui-37"></i> <span translate="common.search">寃��깋</span> </button> @@ -34,7 +34,7 @@ <label> <select name="pageRow" class="form-control form-control-sm" - ng-change="fn.changePageRowCount()" + ng-change="fn.changeLevelPageRowCount()" 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="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a> - <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a> + <a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.allDownloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a> + <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.selectDelete" class="ng-scope">�궘�젣</span></a> </div> </div> </form> -- Gitblit v1.8.0