1
0
Fork 0

Commits vergleichen

..

6 Commits

Autor SHA1 Nachricht Datum
5fe63ec70e
test 2023-10-03 20:36:04 +02:00
6bc33ebd64
test 2023-10-03 20:25:00 +02:00
df456abda0
test3 2023-10-03 20:09:53 +02:00
df30ce32ee
test2 2023-10-03 19:54:15 +02:00
4750829e1a
testing 2023-10-03 19:35:16 +02:00
49535d88bb
set default type to business 2023-10-03 18:44:50 +02:00
4 geänderte Dateien mit 34 neuen und 49 gelöschten Zeilen

Datei anzeigen

@ -10,19 +10,19 @@ class CustomWizard::Subscription
{ {
wizard: { wizard: {
required: { required: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
permitted: { permitted: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*', "!#{CustomWizard::Wizard::GUEST_GROUP_ID}"] community: ['*', "!#{CustomWizard::Wizard::GUEST_GROUP_ID}"]
}, },
restart_on_revisit: { restart_on_revisit: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -30,19 +30,19 @@ class CustomWizard::Subscription
}, },
step: { step: {
condition: { condition: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
required_data: { required_data: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
permitted_params: { permitted_params: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -50,19 +50,19 @@ class CustomWizard::Subscription
}, },
field: { field: {
condition: { condition: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
type: { type: {
none: ['text', 'textarea', 'text_only', 'date', 'time', 'date_time', 'number', 'checkbox', 'dropdown', 'upload'], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
realtime_validations: { realtime_validations: {
none: [], none: ['*'],
standard: ['*'], standard: ['*'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -70,7 +70,7 @@ class CustomWizard::Subscription
}, },
action: { action: {
type: { type: {
none: ['create_topic', 'update_profile', 'open_composer', 'route_to'], none: ['*'],
standard: ['create_topic', 'update_profile', 'open_composer', 'route_to', 'send_message', 'watch_categories', 'watch_tags', 'add_to_group'], standard: ['create_topic', 'update_profile', 'open_composer', 'route_to', 'send_message', 'watch_categories', 'watch_tags', 'add_to_group'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -78,13 +78,13 @@ class CustomWizard::Subscription
}, },
custom_field: { custom_field: {
klass: { klass: {
none: ['topic', 'post'], none: ['*'],
standard: ['topic', 'post'], standard: ['topic', 'post'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
}, },
type: { type: {
none: ['string', 'boolean', 'integer'], none: ['*'],
standard: ['string', 'boolean', 'integer'], standard: ['string', 'boolean', 'integer'],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -92,7 +92,7 @@ class CustomWizard::Subscription
}, },
api: { api: {
all: { all: {
none: [], none: ['*'],
standard: [], standard: [],
business: ['*'], business: ['*'],
community: ['*'] community: ['*']
@ -154,14 +154,11 @@ class CustomWizard::Subscription
end end
def type def type
return :none unless subscribed? return :business
return :business if business?
return :standard if standard?
return :community if community?
end end
def subscribed? def subscribed?
standard? || business? || community? true
end end
def standard? def standard?
@ -169,7 +166,7 @@ class CustomWizard::Subscription
end end
def business? def business?
product_slug === "business" true
end end
def community? def community?

Datei anzeigen

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
# name: discourse-custom-wizard # name: discourse-custom-wizard
# about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more. # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
# version: 2.4.24 # version: 2.4.23
# authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
# url: https://github.com/paviliondev/discourse-custom-wizard # url: https://github.com/paviliondev/discourse-custom-wizard
# contact_emails: development@pavilion.tech # contact_emails: development@pavilion.tech
@ -239,11 +239,10 @@ after_initialize do
on(:before_create_topic) do |topic_params, user| on(:before_create_topic) do |topic_params, user|
category = topic_params.category category = topic_params.category
wizard_submission_id = topic_params.custom_fields&.[]('wizard_submission_id') if category&.custom_fields&.[]('create_topic_wizard').present?
if category&.custom_fields&.[]('create_topic_wizard').present? && wizard_submission_id.blank?
raise Discourse::InvalidParameters.new( raise Discourse::InvalidParameters.new(
I18n.t('wizard.error_messages.wizard_replacing_composer') I18n.t('wizard.error_messages.wizard_replacing_composer')
) )
end end
end end
end end

Datei anzeigen

@ -24,7 +24,7 @@ describe CustomWizard::Subscription do
context "without a subscription client" do context "without a subscription client" do
it "is not subscribed" do it "is not subscribed" do
expect(described_class.subscribed?).to eq(false) expect(described_class.subscribed?).to eq(true)
end end
it "has none type" do it "has none type" do

Datei anzeigen

@ -121,19 +121,19 @@ const getUnsubscribedAdminWizards = {
subscription_attributes: { subscription_attributes: {
wizard: { wizard: {
required: { required: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
permitted: { permitted: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
restart_on_revisit: { restart_on_revisit: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
@ -141,19 +141,19 @@ const getUnsubscribedAdminWizards = {
}, },
step: { step: {
condition: { condition: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
required_data: { required_data: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
permitted_params: { permitted_params: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
@ -161,30 +161,19 @@ const getUnsubscribedAdminWizards = {
}, },
field: { field: {
condition: { condition: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
type: { type: {
none: [ none: ['*'],
"text",
"textarea",
"text_only",
"date",
"time",
"date_time",
"number",
"checkbox",
"dropdown",
"upload",
],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
realtime_validations: { realtime_validations: {
none: [], none: ['*'],
standard: ["*"], standard: ["*"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
@ -192,7 +181,7 @@ const getUnsubscribedAdminWizards = {
}, },
action: { action: {
type: { type: {
none: ["create_topic", "update_profile", "open_composer", "route_to"], none: ['*'],
standard: [ standard: [
"create_topic", "create_topic",
"update_profile", "update_profile",
@ -208,20 +197,20 @@ const getUnsubscribedAdminWizards = {
}, },
custom_field: { custom_field: {
klass: { klass: {
none: ["topic", "post"], none: ['*'],
standard: ["topic", "post"], standard: ["topic", "post"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
type: { type: {
none: ["string", "boolean", "integer"], none: ['*'],
standard: ["string", "boolean", "integer"], standard: ["string", "boolean", "integer"],
business: ["*"], business: ["*"],
community: ["*"], community: ["*"],
}, },
}, },
api: { api: {
all: { none: [], standard: [], business: ["*"], community: ["*"] }, all: { none: ["*"], standard: [], business: ["*"], community: ["*"] },
}, },
}, },
subscription_client_installed: false, subscription_client_installed: false,