From 38b0474e35d4dfd85e25943d4edd08f1f39b3ff1 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Sun, 22 Aug 2021 14:20:08 -0400 Subject: [PATCH] GUACAMOLE-1261: Enable eager interpretation of route parameters for users, groups, and connections. With the addition of the '*' to the route parameters, the AngularJS router will interpret parameters that include a slash, allowing for user, group, and connection names to contain slashes. --- .../frontend/src/app/index/config/indexRouteConfig.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guacamole/src/main/frontend/src/app/index/config/indexRouteConfig.js b/guacamole/src/main/frontend/src/app/index/config/indexRouteConfig.js index 322f7eaba..38ef98a5c 100644 --- a/guacamole/src/main/frontend/src/app/index/config/indexRouteConfig.js +++ b/guacamole/src/main/frontend/src/app/index/config/indexRouteConfig.js @@ -136,7 +136,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }) // Connection editor - .when('/manage/:dataSource/connections/:id?', { + .when('/manage/:dataSource/connections/:id*?', { title : 'APP.NAME', bodyClassName : 'manage', templateUrl : 'app/manage/templates/manageConnection.html', @@ -145,7 +145,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }) // Sharing profile editor - .when('/manage/:dataSource/sharingProfiles/:id?', { + .when('/manage/:dataSource/sharingProfiles/:id*?', { title : 'APP.NAME', bodyClassName : 'manage', templateUrl : 'app/manage/templates/manageSharingProfile.html', @@ -154,7 +154,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }) // Connection group editor - .when('/manage/:dataSource/connectionGroups/:id?', { + .when('/manage/:dataSource/connectionGroups/:id*?', { title : 'APP.NAME', bodyClassName : 'manage', templateUrl : 'app/manage/templates/manageConnectionGroup.html', @@ -163,7 +163,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }) // User editor - .when('/manage/:dataSource/users/:id?', { + .when('/manage/:dataSource/users/:id*?', { title : 'APP.NAME', bodyClassName : 'manage', templateUrl : 'app/manage/templates/manageUser.html', @@ -172,7 +172,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }) // User group editor - .when('/manage/:dataSource/userGroups/:id?', { + .when('/manage/:dataSource/userGroups/:id*?', { title : 'APP.NAME', bodyClassName : 'manage', templateUrl : 'app/manage/templates/manageUserGroup.html',