diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 index b5c10c65..8efb7f0c 100644 --- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 @@ -86,8 +86,8 @@ export default Component.extend(UndoChanges, { if (this.isDropdown) { options.wizardFieldSelection = "key,value"; options.userFieldOptionsSelection = "output"; - options.textSelection = "key,value,output"; - options.inputTypes = "conditional,association,assignment"; + options.textSelection = "key,value"; + options.inputTypes = "association,conditional,assignment"; options.pairConnector = "association"; options.keyPlaceholder = "admin.wizard.key"; options.valuePlaceholder = "admin.wizard.value"; diff --git a/coverage/.last_run.json b/coverage/.last_run.json index a2dfb49e..4c7365e8 100644 --- a/coverage/.last_run.json +++ b/coverage/.last_run.json @@ -1,5 +1,5 @@ { "result": { - "line": 92.52 + "line": 92.87 } } diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb index 681bc459..8279d070 100644 --- a/lib/custom_wizard/builder.rb +++ b/lib/custom_wizard/builder.rb @@ -154,15 +154,6 @@ class CustomWizard::Builder end end - if content[:type] == 'assignment' && field_template['type'] === 'dropdown' - content[:result] = content[:result].map do |item| - { - id: item, - name: item - } - end - end - params[:content] = content[:result] end end diff --git a/plugin.rb b/plugin.rb index 9ff3fada..741cdd83 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-custom-wizard # about: Create custom wizards -# version: 1.18.2.stable +# version: 1.18.3.stable # authors: Angus McLeod # url: https://github.com/paviliondev/discourse-custom-wizard # contact emails: angus@thepavilion.io diff --git a/serializers/custom_wizard/wizard_field_serializer.rb b/serializers/custom_wizard/wizard_field_serializer.rb index 9aa750e5..70784f7f 100644 --- a/serializers/custom_wizard/wizard_field_serializer.rb +++ b/serializers/custom_wizard/wizard_field_serializer.rb @@ -101,7 +101,7 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer object.content end - def content + def tag_groups object.tag_groups end