From 69b42e5bab73a5bfc3e0d4ddc660877b0bc08c05 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 04 11월 2021 10:39:01 +0900
Subject: [PATCH] 사용자 등급 추가 오류 수정
---
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 75 +++++++------------------------------
1 files changed, 15 insertions(+), 60 deletions(-)
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 8ea347e..8df62d9 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -4,45 +4,20 @@
<div class="searchdiv">
<form name="userWorkspaceForm" role="form" ng-enter="fn.getUserWorkspaceList(0)">
<div class="row">
- <!--<div class="col-xl-2">
- <div class="form-group">
- <label translate="common.name">�씠由�</label>
- <input class="form-control" type="text" ng-model="vm.search.name" maxlength="10">
- </div>
- </div>
-
- <div class="col-xl-3">
- <div class="form-group">
- <label translate="common.status">�긽�깭</label>
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="statuses"
- selected-model="vm.search.statuses"
- extra-settings="{ stringTypeOption : true }"
- options="vm.options.statuses"></ng-dropdown-multiselect>
- </div>
- </div>
-
- <div class="col-xl-3">
- <div class="form-group">
- <label translate="common.email">�씠硫붿씪</label>
- <input class="form-control" type="text" ng-model="vm.search.account" maxlength="50">
- </div>
- </div>-->
-
- <div class="col-xl-3">
- <div class="form-group">
- <label translate="managementWorkspace.levelName">�벑湲됰챸</label>
- <input class="form-control" type="text" ng-model="vm.search.level" maxlength="50">
- </div>
- </div>
-
<div class="col-xl-4">
+ <div class="form-group" style="margin-left: 50px">
+ <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="form-group form-buttons-w2">
- <button class="btn btn-xlg btn-navy" ng-click="fn.getUserWorkspaceList(0)">
+ <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(vm.page.selectedPage-1)">
<i class="os-icon os-icon-ui-37"></i>
<span translate="common.search">寃��깋</span>
</button>
- <button class="btn btn-xlg btn-white" ng-click="fn.initSearch()">
+ <button class="btn btn-xlg btn-white" ng-click="fn.initSearchUserLevel()">
<i class="os-icon os-icon-grid-18"></i>
<span translate="common.reset">珥덇린�솕</span>
</button>
@@ -69,29 +44,14 @@
</label>
</div>
</div>
- <div class="col-sm-6 text-right">
- <!--<div class="btn-group">
- <button aria-expanded="false"
- aria-haspopup="true"
- class="btn btn-secondary dropdown-toggle"
- data-toggle="dropdown"
- type="button">異붽�湲곕뒫
- </button>
- <div aria-labelledby="dropdownMenuButton2"
- class="dropdown-menu"
- x-placement="bottom-start"
- style="position: absolute; transform: translate3d(0px, 30px, 0px); top: 0px; left: 0px; will-change: transform;">
- <a class="dropdown-item cursor ng-isolate-scope" form-submit="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item" href="#"> �궘�젣</a>
- </div>
- </div>-->
- <form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/workspace/downloadExcel" name="userLevelListForm">
+ <div class="col-sm-6 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
+ <form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/userLevel/downloadExcel" name="userLevelListForm">
<input type="hidden" name="conditions" autocomplete="off">
<div class="btn-group">
<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="projectListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <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>
</div>
</div>
@@ -100,14 +60,9 @@
</div>
</div>
- <!--<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
- event="vm.tableEvent"></js-table>
- </div>-->
-
<div class="table-responsive">
- <js-table data="vm.responseData.data" table-configs="vm.tableConfigs"
- event="vm.tableEvent"></js-table>
+ <js-table data="vm.responseData.data" table-configs="vm.tableConfigs1"
+ event="tableEvent1"></js-table>
</div>
<div class="controls-below-table text-center">
@@ -117,7 +72,7 @@
total-items="vm.responseData.page.totalCount"
ng-model="vm.page.selectedPage"
max-size="10"
- ng-click="fn.getUserWorkspaceList(vm.page.selectedPage-1)"
+ ng-click="fn.getUserLevelList(vm.page.selectedPage-1)"
class="pagination pagination-sm"
previous-text="Prev"
next-text="Next"
--
Gitblit v1.8.0