From 0e5f0fc86da46857ced9ec696a28978296ce3cd4 Mon Sep 17 00:00:00 2001 From: jumagura Date: Wed, 15 Mar 2023 21:52:44 -0400 Subject: [PATCH] DEV:Bump version --- plugin.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/plugin.rb b/plugin.rb index c18e79d9..3a65d315 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,15 +1,15 @@ # 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.2.9 +# version: 2.3.0 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever # url: https://github.com/paviliondev/discourse-custom-wizard # contact_emails: development@pavilion.tech # subscription_url: https://coop.pavilion.tech -gem "liquid", "5.0.1", require: true -register_asset "stylesheets/common/admin.scss" -register_asset "stylesheets/common/wizard.scss" +gem 'liquid', '5.0.1', require: true +register_asset 'stylesheets/common/admin.scss' +register_asset 'stylesheets/common/wizard.scss' enabled_site_setting :custom_wizard_enabled @@ -111,7 +111,7 @@ after_initialize do Liquid::Template.register_filter(::CustomWizard::LiquidFilter::FirstNonEmpty) add_to_class(:topic, :wizard_submission_id) do - custom_fields["wizard_submission_id"] + custom_fields['wizard_submission_id'] end add_class_method(:wizard, :user_requires_completion?) do |user| @@ -123,6 +123,7 @@ after_initialize do if user && user.first_seen_at.blank? && wizard = CustomWizard::Wizard.after_signup(user) + if !wizard.completed? custom_redirect = true CustomWizard::Wizard.set_user_redirect(wizard.id, user) @@ -133,8 +134,8 @@ after_initialize do end add_to_class(:user, :redirect_to_wizard) do - if custom_fields["redirect_to_wizard"].present? - custom_fields["redirect_to_wizard"] + if custom_fields['redirect_to_wizard'].present? + custom_fields['redirect_to_wizard'] else nil end @@ -159,10 +160,10 @@ after_initialize do end add_to_class(:application_controller, :redirect_to_wizard_if_required) do - @excluded_routes ||= SiteSetting.wizard_redirect_exclude_paths.split("|") + ["/w/"] + @excluded_routes ||= SiteSetting.wizard_redirect_exclude_paths.split('|') + ['/w/'] url = request.referer || request.original_url excluded_route = @excluded_routes.any? { |str| /#{str}/ =~ url } - not_api = request.format === "text/html" + not_api = request.format === 'text/html' if not_api && !excluded_route wizard_id = current_user.redirect_to_wizard @@ -202,7 +203,7 @@ after_initialize do full_path = "#{Rails.root}/plugins/discourse-custom-wizard/assets/stylesheets/wizard/wizard_custom.scss" if Stylesheet::Importer.respond_to?(:plugin_assets) - Stylesheet::Importer.plugin_assets["wizard_custom"] = Set[full_path] + Stylesheet::Importer.plugin_assets['wizard_custom'] = Set[full_path] else # legacy method, Discourse 2.7.0.beta5 and below DiscoursePluginRegistry.register_asset(full_path, {}, "wizard_custom")