GUACAMOLE-339: Display the remote host field in connection history tables.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/7522a495 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/7522a495 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/7522a495 Branch: refs/heads/master Commit: 7522a495b823f7facaa571cf743613d85fe59e7a Parents: f2120c8 Author: Nick Couchman <[email protected]> Authored: Sun Jul 16 22:23:00 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Sun Jul 16 22:23:00 2017 -0400 ---------------------------------------------------------------------- .../webapp/app/manage/templates/manageConnection.html | 2 ++ .../main/webapp/app/rest/types/ConnectionHistoryEntry.js | 9 ++++++++- .../settings/directives/guacSettingsConnectionHistory.js | 10 +++++++--- .../app/settings/templates/settingsConnectionHistory.html | 4 ++++ .../app/settings/types/ConnectionHistoryEntryWrapper.js | 7 +++++++ guacamole/src/main/webapp/translations/en.json | 8 +++++--- 6 files changed, 33 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/app/manage/templates/manageConnection.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html index 85e4f91..737ace3 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html @@ -72,6 +72,7 @@ <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_USERNAME' | translate}}</th> <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_START' | translate}}</th> <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_DURATION' | translate}}</th> + <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_REMOTEHOST' | translate}}</th> </tr> </thead> <tbody> @@ -81,6 +82,7 @@ <td class="duration" translate="{{wrapper.durationText}}" translate-values="{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"></td> + <td class="remoteHost">{{wrapper.entry.remoteHost}}</td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js b/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js index e4dfb14..bfa9f69 100644 --- a/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js +++ b/guacamole/src/main/webapp/app/rest/types/ConnectionHistoryEntry.js @@ -53,6 +53,13 @@ angular.module('rest').factory('ConnectionHistoryEntry', [function defineConnect this.connectionName = template.connectionName; /** + * The remote host associated with this history entry. + * + * @type String + */ + this.remoteHost = template.remoteHost; + + /** * The time that usage began, in seconds since 1970-01-01 00:00:00 UTC. * * @type Number @@ -186,4 +193,4 @@ angular.module('rest').factory('ConnectionHistoryEntry', [function defineConnect return ConnectionHistoryEntry; -}]); \ No newline at end of file +}]); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js index 216641d..09ce841 100644 --- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsConnectionHistory.js @@ -84,7 +84,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function '-startDate', '-duration', 'username', - 'connectionName' + 'connectionName', + 'remoteHost' ]); // Get session date format @@ -192,6 +193,7 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function 'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_STARTDATE', 'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_DURATION', 'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME', + 'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST', 'SETTINGS_CONNECTION_HISTORY.FILENAME_HISTORY_CSV' ]).then(function headerTranslated(translations) { @@ -200,7 +202,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_USERNAME'], translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_STARTDATE'], translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_DURATION'], - translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME'] + translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME'], + translations['SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST'] ]]; // Add rows for all history entries, using the same sort @@ -215,7 +218,8 @@ angular.module('settings').directive('guacSettingsConnectionHistory', [function historyEntryWrapper.username, $filter('date')(historyEntryWrapper.startDate, $scope.dateFormat), historyEntryWrapper.duration / 1000, - historyEntryWrapper.connectionName + historyEntryWrapper.connectionName, + historyEntryWrapper.remoteHost ]); } ); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html index 2963ba1..67d6206 100644 --- a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html @@ -29,6 +29,9 @@ <th guac-sort-order="order" guac-sort-property="'connectionName'"> {{'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_CONNECTION_NAME' | translate}} </th> + <th guac-sort-order="order" guac-sort-property="'remoteHost'"> + {{'SETTINGS_CONNECTION_HISTORY.TABLE_HEADER_SESSION_REMOTEHOST' | translate}} + </th> </tr> </thead> <tbody ng-class="{loading: !isLoaded()}"> @@ -38,6 +41,7 @@ <td translate="{{historyEntryWrapper.readableDurationText}}" translate-values="{VALUE: historyEntryWrapper.readableDuration.value, UNIT: historyEntryWrapper.readableDuration.unit}"></td> <td>{{historyEntryWrapper.connectionName}}</td> + <td>{{historyEntryWrapper.remoteHost}}</td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js b/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js index 9794f6a..87d6917 100644 --- a/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js +++ b/guacamole/src/main/webapp/app/settings/types/ConnectionHistoryEntryWrapper.js @@ -51,6 +51,13 @@ angular.module('settings').factory('ConnectionHistoryEntryWrapper', ['$injector' this.connectionName = historyEntry.connectionName; /** + * The remote host associated with this history entry. + * + * @type String + */ + this.remoteHost = historyEntry.remoteHost; + + /** * The username of the user associated with this particular usage of * the connection. * http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/7522a495/guacamole/src/main/webapp/translations/en.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 0fa7929..2b4fb5d 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -220,9 +220,10 @@ "SECTION_HEADER_HISTORY" : "Usage History", "SECTION_HEADER_PARAMETERS" : "Parameters", - "TABLE_HEADER_HISTORY_USERNAME" : "Username", - "TABLE_HEADER_HISTORY_START" : "Start Time", - "TABLE_HEADER_HISTORY_DURATION" : "Duration", + "TABLE_HEADER_HISTORY_USERNAME" : "Username", + "TABLE_HEADER_HISTORY_START" : "Start Time", + "TABLE_HEADER_HISTORY_DURATION" : "Duration", + "TABLE_HEADER_HISTORY_REMOTEHOST" : "Remote Host", "TEXT_CONFIRM_DELETE" : "Connections cannot be restored after they have been deleted. Are you sure you want to delete this connection?", "TEXT_HISTORY_DURATION" : "@:APP.TEXT_HISTORY_DURATION" @@ -598,6 +599,7 @@ "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name", "TABLE_HEADER_SESSION_DURATION" : "Duration", + "TABLE_HEADER_SESSION_REMOTEHOST" : "Remote host", "TABLE_HEADER_SESSION_STARTDATE" : "Start time", "TABLE_HEADER_SESSION_USERNAME" : "Username",
