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

GUAC-1193: Show the gear within the history table when search results are loading.

Browse Source
This commit is contained in:
Michael Jumper
2015-10-16 22:45:34 -07:00
parent 50e7c7075f
commit 18d8674c6f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js
View File

@@ -110,7 +110,20 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function
return $scope.historyRecords !== null return $scope.historyRecords !== null
&& $scope.dateFormat !== null; && $scope.dateFormat !== null;
}; };
/**
* Returns whether the search has completed but contains no history
* records. This function will return false if there are history
* records in the results OR if the search has not yet completed.
*
* @returns {Boolean}
* true if the search results have been loaded but no history
* records are present, false otherwise.
*/
$scope.isHistoryEmpty = function isHistoryEmpty() {
return $scope.isLoaded() && $scope.historyRecords.length === 0;
};
/** /**
* Query the API for the connection record history, filtered by * Query the API for the connection record history, filtered by
* searchString, and ordered by order. * searchString, and ordered by order.

6
guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html
View File

@@ -31,7 +31,7 @@
</form> </form>
<!-- Search results --> <!-- Search results -->
<div class="results" ng-class="{loading: !isLoaded()}"> <div class="results">
<!-- List of matching history records --> <!-- List of matching history records -->
<table class="sorted history-list"> <table class="sorted history-list">
@@ -51,7 +51,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-class="{loading: !isLoaded()}">
<tr ng-repeat="historyRecord in historyRecordPage" class="history"> <tr ng-repeat="historyRecord in historyRecordPage" class="history">
<td>{{historyRecord.username}}</td> <td>{{historyRecord.username}}</td>
<td>{{historyRecord.startDate | date : dateFormat}}</td> <td>{{historyRecord.startDate | date : dateFormat}}</td>
@@ -62,7 +62,7 @@
</table> </table>
<!-- Text displayed if no history exists --> <!-- Text displayed if no history exists -->
<p class="placeholder" ng-hide="historyRecordPage.length"> <p class="placeholder" ng-show="isHistoryEmpty()">
{{'SETTINGS_CONNECTION_HISTORY.INFO_NO_HISTORY' | translate}} {{'SETTINGS_CONNECTION_HISTORY.INFO_NO_HISTORY' | translate}}
</p> </p>