From a184225c8bdf2599e15a75da6e4e55ced8b989ca Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Sun, 27 Dec 2020 16:57:27 +0100 Subject: [PATCH] fix space_auth being overriden by unused parameter, add 'nickname' GET param Signed-off-by: Julien Veyssier --- public/javascripts/spacedeck_spaces.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/javascripts/spacedeck_spaces.js b/public/javascripts/spacedeck_spaces.js index 6f96a66..0188cad 100644 --- a/public/javascripts/spacedeck_spaces.js +++ b/public/javascripts/spacedeck_spaces.js @@ -99,7 +99,7 @@ var SpacedeckSpaces = { }.bind(this), {value: dft || "Guest "+parseInt(10000*Math.random()), ok: __("ok"), cancel: __("cancel")}); }, - load_space: function(space_id, on_success, on_error, space_auth) { + load_space: function(space_id, on_success, on_error) { this.folder_spaces_filter=""; this.folder_spaces_search=""; @@ -308,7 +308,8 @@ var SpacedeckSpaces = { userReady(); } - if (!this.user && space_auth) { + if (!this.user.nickname && space_auth) { + this.guest_nickname = get_query_param("nickname") || this.guest_nickname; if (this.guest_nickname) { userReady(); } else {