mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #154 from eneiluj/fix/space-auth-guest-nickname-issue

Browse Source 
Fix space_auth being overriden by unused parameter, add 'nickname' GET param
This commit is contained in:
banglashi
2021-03-23 23:19:04 +01:00
committed by GitHub
parent b626a21b83 a184225c8b
commit 38fffa5644
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/javascripts/spacedeck_spaces.js
View File

@@ -99,7 +99,7 @@ var SpacedeckSpaces = {
}.bind(this), {value: dft || "Guest "+parseInt(10000*Math.random()), ok: __("ok"), cancel: __("cancel")}); }.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_filter="";
this.folder_spaces_search=""; this.folder_spaces_search="";
@@ -308,7 +308,8 @@ var SpacedeckSpaces = {
userReady(); 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) { if (this.guest_nickname) {
userReady(); userReady();
} else { } else {