From 9064b2fcbb86c43a79b5584ecb601675940c6ca7 Mon Sep 17 00:00:00 2001 From: Wan Bachtiar Date: Fri, 11 Nov 2022 15:56:07 +1100 Subject: [PATCH 1/4] Patch for wizard URL path to take account of Discourse with subdirectory base URL. --- .../discourse/controllers/admin-wizards-wizard-show.js.es6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index e6b0ad04..74c239fe 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -36,6 +36,10 @@ export default Controller.extend({ @discourseComputed("wizard.id") wizardUrl(wizardId) { + let baseUrl = (window.location.href).split('/admin'); + if (baseUrl.length > 1) { + return baseUrl[0] + "/w/" + dasherize(wizardId); + } return window.location.origin + "/w/" + dasherize(wizardId); }, From d68cd4a9fb2c967af48512bf5fee153b0784c498 Mon Sep 17 00:00:00 2001 From: Wan Bachtiar Date: Fri, 11 Nov 2022 16:36:18 +1100 Subject: [PATCH 2/4] Bump version --- .../discourse/controllers/admin-wizards-wizard-show.js.es6 | 2 +- plugin.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index 74c239fe..21777c07 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -39,7 +39,7 @@ export default Controller.extend({ let baseUrl = (window.location.href).split('/admin'); if (baseUrl.length > 1) { return baseUrl[0] + "/w/" + dasherize(wizardId); - } + } return window.location.origin + "/w/" + dasherize(wizardId); }, diff --git a/plugin.rb b/plugin.rb index d092790f..2b35cc81 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-custom-wizard # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more. -# version: 2.1.1 +# version: 2.1.2 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever # url: https://github.com/paviliondev/discourse-custom-wizard # contact_emails: development@pavilion.tech From d6ee1501d1ab8365b0be6a04ba9f2b1ecba2e493 Mon Sep 17 00:00:00 2001 From: Wan Bachtiar Date: Fri, 11 Nov 2022 20:43:57 +1100 Subject: [PATCH 3/4] prettier --- .../discourse/controllers/admin-wizards-wizard-show.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index 21777c07..c2fff7fe 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -36,7 +36,7 @@ export default Controller.extend({ @discourseComputed("wizard.id") wizardUrl(wizardId) { - let baseUrl = (window.location.href).split('/admin'); + let baseUrl = window.location.href.split("/admin"); if (baseUrl.length > 1) { return baseUrl[0] + "/w/" + dasherize(wizardId); } From 5b923f3340cc1cdd9d2fe9e5009c266dc4d4c85a Mon Sep 17 00:00:00 2001 From: Wan Bachtiar Date: Thu, 17 Nov 2022 08:59:53 +1100 Subject: [PATCH 4/4] Removed conditional statement that would always be true --- .../discourse/controllers/admin-wizards-wizard-show.js.es6 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index c2fff7fe..c9a80e0e 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -37,10 +37,7 @@ export default Controller.extend({ @discourseComputed("wizard.id") wizardUrl(wizardId) { let baseUrl = window.location.href.split("/admin"); - if (baseUrl.length > 1) { - return baseUrl[0] + "/w/" + dasherize(wizardId); - } - return window.location.origin + "/w/" + dasherize(wizardId); + return baseUrl[0] + "/w/" + dasherize(wizardId); }, @discourseComputed("wizard.after_time_scheduled")