From 31fc2d8787cdaa847f4a814c6853fc826da43bf0 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 13 Aug 2015 15:52:22 -0700 Subject: [PATCH 1/2] GUAC-1292: Verify existence of filesystem before refreshing. --- .../main/webapp/app/client/directives/guacFileBrowser.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js index dca073a66..126001397 100644 --- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js +++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js @@ -250,7 +250,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser( // Refresh file browser when any upload completes $scope.$on('guacUploadComplete', function uploadComplete(event, filename) { - ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory); + + // Refresh filesystem, if it exists + if ($scope.filesystem) + ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory); + }); }] From 438ccf7ec471d21b8bcd2b227d13e379aee572f6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 13 Aug 2015 15:53:01 -0700 Subject: [PATCH 2/2] GUAC-1292: Add "sftp-directory" parameter to VNC and RDP. --- .../main/resources/org/glyptodon/guacamole/protocols/rdp.json | 4 ++++ .../main/resources/org/glyptodon/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 2 ++ 3 files changed, 10 insertions(+) diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json index 2a672c64e..17bcb3459 100644 --- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json +++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json @@ -223,6 +223,10 @@ { "name" : "sftp-passphrase", "type" : "PASSWORD" + }, + { + "name" : "sftp-directory", + "type" : "TEXT" } ] } diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json index 31dc803c6..5020ca827 100644 --- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json +++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.json @@ -97,6 +97,10 @@ { "name" : "sftp-passphrase", "type" : "PASSWORD" + }, + { + "name" : "sftp-directory", + "type" : "TEXT" } ] }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 553e80427..7e98449a1 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -277,6 +277,7 @@ "FIELD_HEADER_REMOTE_APP" : "Program:", "FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", + "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:", @@ -404,6 +405,7 @@ "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Read-only:", + "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:",