From fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 10:37:28 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/workspace/workspaceUserConfig.html | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 7562820..90ba5e8 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -97,7 +97,7 @@
<label>�벑湲�</label>
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="levels"
- selected-model="vm.search.levels.levelName"
+ selected-model="vm.search.levels"
options="vm.levels"></ng-dropdown-multiselect>
</div>
</div>
@@ -108,7 +108,7 @@
<ng-dropdown-multiselect class="multiSelect cursor"
data-input-name="departments"
selected-model="vm.search.departments"
- options="::vm.departments"></ng-dropdown-multiselect>
+ options="vm.departments"></ng-dropdown-multiselect>
</div>
</div>
@@ -152,22 +152,6 @@
</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" href="#"> �궘�젣</a>
- </div>
- </div>
- </div>-->
</div>
</div>
--
Gitblit v1.8.0