Skip to content

Commit f04aed1

Browse files
committed
bug fix.
- do not filtered when filter at group link view.
1 parent 786c914 commit f04aed1

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

‎web/src/main/webapp/features/groupedApplicationList/groupedApplicationList.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<div class="panel panel-default grouped-application-list" ng-show="isGroupedNode || isGroupedLink">
22
<div class="panel-heading">
33
<span class="badge">{{groupedApplicationList.length}}</span> applications<span class="badge count">{{totalCount | number:0}}</span>
4-
<div class="input-group form-group">
4+
<div ng-if="isGroupedNode" class="input-group form-group">
55
<input type="text" ng-model="searchKeyword.applicationName" class="form-control"><span class="input-group-addon"><span class="glyphicon glyphicon-search" style="top:0;"></span></span>
66
</div>
7+
<div ng-if="isGroupedLink" class="input-group form-group">
8+
<input type="text" ng-model="searchKeyword.toNode.applicationName" class="form-control"><span class="input-group-addon"><span class="glyphicon glyphicon-search" style="top:0;"></span></span>
9+
</div>
710
</div>
811
<div class="panel-body">
912
<ul ng-if="isGroupedNode" class="outer">
@@ -16,8 +19,8 @@
1619
</ul>
1720
</li>
1821
</ul>
19-
<ul ng-if="isGroupedLink" class="outer">
20-
<li ng-repeat="app in groupedApplicationList">
22+
<ul ng-if="isGroupedLink" class="outer with-icon">
23+
<li ng-repeat="app in groupedApplicationList | filter:searchKeyword">
2124
<button class="btn btn-default btn-xs" ng-click="openFilteredMapWindow(app)">
2225
<span class="glyphicon glyphicon-filter"></span>
2326
</button>

‎web/src/main/webapp/styles/main.css‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,11 @@ canvas {outline:none}
422422
}
423423
.grouped-application-list span.count {
424424
float: right;
425+
width: 100px;
426+
overflow: hidden;
427+
text-align: right;
428+
white-space: nowrap;
429+
text-overflow: ellipsis;
425430
}
426431
.grouped-application-list ul.outer {
427432
padding-left: 0px;
@@ -447,6 +452,15 @@ canvas {outline:none}
447452
white-space: nowrap;
448453
text-overflow: ellipsis;
449454
}
455+
.grouped-application-list ul.with-icon > li > p.name {
456+
width: 220px;
457+
margin: 0px 0px -4px 0px;
458+
display: inline-block;
459+
overflow: hidden;
460+
white-space: nowrap;
461+
text-overflow: ellipsis;
462+
}
463+
450464
.grouped-application-list ul.inner > li > p.name {
451465
width: 300px;
452466
margin: 0px;

0 commit comments

Comments
 (0)