diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 index 1afb1683..484b501a 100644 --- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 @@ -32,12 +32,7 @@ export default Ember.Component.extend({ name: I18n.t('admin.wizard.field.choices_preset.tags') } ]; - if (Discourse.SiteSettings.nationalflag_enabled) { - presets.push({ - id: 'flags', - name: I18n.t('admin.wizard.field.choices_preset.flags') - }) - } + return presets; }, diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js index ce454717..64e46725 100644 --- a/assets/javascripts/wizard-custom.js +++ b/assets/javascripts/wizard-custom.js @@ -32,6 +32,7 @@ //= require discourse/mixins/singleton +//= require discourse/models/login-method //= require discourse/models/permission-type //= require discourse/models/archetype //= require discourse/models/rest diff --git a/assets/javascripts/wizard/initializers/custom.js.es6 b/assets/javascripts/wizard/initializers/custom.js.es6 index 04dd7188..de336fa7 100644 --- a/assets/javascripts/wizard/initializers/custom.js.es6 +++ b/assets/javascripts/wizard/initializers/custom.js.es6 @@ -29,19 +29,6 @@ export default { registerRawHelpers(RawHandlebars, Handlebars); - WizardFieldDropdown.reopen({ - tagName: 'span', - classNames: ['wizard-select-value'], - - @computed - isFlagSelector() { - const field = this.get('field'); - //TODO improve the way this detects a flag dropdown (currently it relies on the string 'Nation', e.g. 'Nationality' or 'National Flag' appearing in label) - return (typeof field.label !== 'undefined') ? (field.label.includes(Discourse.SiteSettings.wizard_national_flags_label_cue)) ? true : false : false; - } - }); - - // IE11 Polyfill - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill if (!Object.entries) Object.entries = function( obj ){ diff --git a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs index 011a2e3f..4f411ce3 100644 --- a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs +++ b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs @@ -4,7 +4,4 @@ content=field.choices none=(hash id="__none__" label=field.dropdown_none) nameProperty="label" - tabindex="9"}} -{{#if isFlagSelector}} - -{{/if}} + tabindex="9"}} \ No newline at end of file diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index bcd792f7..65e3890d 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -103,7 +103,6 @@ en: categories: "Categories" groups: "Groups" tags: "Tags" - flags: "Flags" filter: "Preset Filter" choice: value: "Value" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 24322b98..8033e4a7 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -24,5 +24,4 @@ en: site_settings: custom_wizard_enabled: "Enable custom wizards." wizard_redirect_exclude_paths: "Routes excluded from wizard redirects." - wizard_recognised_image_upload_formats: "File types which will result in upload displaying an image preview" - wizard_national_flags_label_cue: "The characters that must appear in the dropdown field label for it to show a flag" \ No newline at end of file + wizard_recognised_image_upload_formats: "File types which will result in upload displaying an image preview" \ No newline at end of file diff --git a/config/settings.yml b/config/settings.yml index 7c51b15f..a5ab7759 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -12,7 +12,4 @@ plugins: default: "jpg|jpeg|png|gif" refresh: true type: list - list_type: compact - wizard_national_flags_label_cue: - client: true - default: "National" + list_type: compact \ No newline at end of file diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb index 5e52c38f..403fcc13 100644 --- a/lib/custom_wizard/builder.rb +++ b/lib/custom_wizard/builder.rb @@ -297,10 +297,6 @@ class CustomWizard::Builder objects = Tag.top_tags(guardian: guardian).map { |tag| TagStruct.new(tag,tag) } end - if field_template['choices_preset'] === 'flags' - objects = CustomWizard::Flags.list - end - if field_template['choices_filters'] && field_template['choices_filters'].length > 0 field_template['choices_filters'].each do |f| objects.reject! do |o| diff --git a/lib/custom_wizard/flags.rb b/lib/custom_wizard/flags.rb deleted file mode 100644 index 00f29866..00000000 --- a/lib/custom_wizard/flags.rb +++ /dev/null @@ -1,31 +0,0 @@ -class CustomWizard::Flag - def initialize(id, name) - @id = id - @name = name - end - - def id - @id - end - - def name - @name - end -end - -class CustomWizard::Flags - - def self.list - raw_flags = YAML.safe_load(File.read(File.join(Rails.root, 'plugins', 'discourse-custom-wizard', 'config', 'national_flags.yml'))) - - flagscollection = [] - - raw_flags.map do |name, pic| - # This is super hacky. Adding the trailing space actually stops search breaking in the dropdown! (and doesn't compromise the view!) - # Feeding just name, name will break search - flagscollection << CustomWizard::Flag.new(name, "#{name} ") - end - - flagscollection - end -end diff --git a/plugin.rb b/plugin.rb index e7168536..c56942f7 100644 --- a/plugin.rb +++ b/plugin.rb @@ -53,7 +53,6 @@ after_initialize do '../jobs/set_after_time_wizard.rb', '../lib/custom_wizard/builder.rb', '../lib/custom_wizard/field.rb', - '../lib/custom_wizard/flags.rb', '../lib/custom_wizard/step_updater.rb', '../lib/custom_wizard/template.rb', '../lib/custom_wizard/wizard.rb',