safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-09 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1138: Move filtering logic into own directive.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-26 13:17:23 -07:00
parent 647a1b15b3
commit 2df72c308c
6 changed files with 176 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole/src/main/webapp/app/manage/controllers/manageSessionsController.js
View File

@@ -29,7 +29,6 @@ angular.module('manage').controller('manageSessionsController', ['$scope', '$inj
// Required types
var ActiveConnectionWrapper = $injector.get('ActiveConnectionWrapper');
var ConnectionGroup = $injector.get('ConnectionGroup');
var FilterPattern = $injector.get('FilterPattern');
var StableSort = $injector.get('StableSort');
// Required services
@@ -55,20 +54,6 @@ angular.module('manage').controller('manageSessionsController', ['$scope', '$inj
*/
$scope.wrappers = null;
/**
* The filter search string to use to restrict the displayed active sessions
*
* @type String
*/
$scope.filterSearchString = null;
/**
* The pattern object to use when filtering active sessions.
*
* @type FilterPattern
*/
$scope.filterPattern = new FilterPattern();
/**
* StableSort instance which maintains the sort order of the visible
* connection wrappers.
@@ -361,9 +346,4 @@ angular.module('manage').controller('manageSessionsController', ['$scope', '$inj
};
// Recompile the filter pattern when changed
$scope.$watch('filterSearchString', function recompilePredicate(searchString) {
$scope.filterPattern.compile(searchString);
});
}]);

15
guacamole/src/main/webapp/app/manage/styles/sessions.css
View File

@@ -76,18 +76,3 @@
.manage table.session-list th.sort-primary.sort-descending:after {
background-image: url('images/arrows/up.png');
}
.manage .sessions .filter {
margin: 0.5em 0;
}
.manage .sessions .filter-string {
background-image: url('images/magnifier.png');
background-repeat: no-repeat;
background-size: 1.75em;
background-position: 0.25em center;
padding: 0.5em;
padding-left: 2.25em;
width: 100%;
max-width: none;
}

10
guacamole/src/main/webapp/app/manage/templates/manageSessions.html
View File

@@ -35,10 +35,10 @@ THE SOFTWARE.
<div class="action-buttons">
<button class="delete-sessions danger" ng-disabled="!canDeleteSessions()" ng-click="deleteSessions()">{{'MANAGE_SESSION.ACTION_DELETE' | translate}}</button>
</div>
<div class="filter">
<input class="filter-string" placeholder="{{'MANAGE_SESSION.FIELD_PLACEHOLDER_FILTER' | translate}}" type="text" ng-model="filterSearchString"/>
</div>
<!-- Session filter -->
<guac-filter filtered-items="filteredWrappers" items="wrappers"
placeholder="'MANAGE_SESSION.FIELD_PLACEHOLDER_FILTER' | translate"></guac-filter>
<!-- List of current user sessions -->
<table class="session-list">
@@ -83,7 +83,7 @@ THE SOFTWARE.
<!-- Pager for session list -->
<guac-pager page="wrapperPage" page-size="25"
items="wrappers | filter : filterPattern.predicate | orderBy : wrapperOrder.predicate"></guac-pager>
items="filteredWrappers | orderBy : wrapperOrder.predicate"></guac-pager>
</div>
</div>