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

GUAC-932: Fix display of history.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-21 20:14:11 -08:00
parent c3bdbcd013
commit 60f249aa6f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
View File

@@ -43,12 +43,11 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
if(!$scope.connection.protocol) if(!$scope.connection.protocol)
$scope.connection.protocol = "vnc"; $scope.connection.protocol = "vnc";
$scope.historyEntryWrappers = [];
// Wrap all the history entries // Wrap all the history entries
if (!newConnection) { if (!newConnection) {
connectionService.getConnectionHistory($scope.connection.identifier).success(function wrapHistoryEntries(historyEntries) { connectionService.getConnectionHistory($scope.connection.identifier).success(function wrapHistoryEntries(historyEntries) {
$scope.historyEntryWrappers = [];
historyEntries.forEach(function wrapHistoryEntry(historyEntry) { historyEntries.forEach(function wrapHistoryEntry(historyEntry) {
$scope.historyEntryWrappers.push(new HistoryEntryWrapper(historyEntry)); $scope.historyEntryWrappers.push(new HistoryEntryWrapper(historyEntry));
}); });
@@ -60,6 +59,7 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
} }
else { else {
$scope.historyEntryWrappers = [];
$scope.connection.parameters = {}; $scope.connection.parameters = {};
} }

9
guacamole/src/main/webapp/app/manage/templates/editableConnection.html
View File

@@ -84,13 +84,10 @@ THE SOFTWARE.
<!-- History connection area --> <!-- History connection area -->
<dt>{{'manage.edit.connection.history.usageHistory' | translate}}</dt> <dt>{{'manage.edit.connection.history.usageHistory' | translate}}</dt>
<dd ng-hide="connection.history.length">
<p>{{'manage.edit.connection.history.connectionNotUsed' | translate}}</p>
</dd>
<!-- History connection list --> <!-- History connection list -->
<dd ng-show="connection.history.length"> <dd ng-class="{loading: !historyEntryWrappers}">
<table class="history section"> <p ng-hide="historyEntryWrappers.length">{{'manage.edit.connection.history.connectionNotUsed' | translate}}</p>
<table class="history section" ng-show="historyEntryWrappers.length">
<tr> <tr>
<th>{{'manage.edit.connection.history.username' | translate}}</th> <th>{{'manage.edit.connection.history.username' | translate}}</th>
<th>{{'manage.edit.connection.history.startTime' | translate}}</th> <th>{{'manage.edit.connection.history.startTime' | translate}}</th>