diff --git a/Gemfile b/Gemfile
index 72dc87335c..d27ec69f86 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,10 +45,6 @@ gem 'daemons'
gem 'delayed_job_active_record'
gem 'delayed_job_web'
-# Fix bug in simple_form preventing collection_check_boxes usage within form_for block
-# When merged, revert to upstream gem
-gem 'simple_form', github: 'RohanM/simple_form'
-
# Spree's default pagination gem (locked to the current version used by Spree)
# We use it's methods in OFN code as well, so this is a direct dependency
gem 'kaminari', '~> 0.14.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index a8d86824fe..4a4c570ca6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
- remote: https://github.com/RohanM/simple_form.git
- revision: 45f08a213b40f3d4bda5f5398db841137587160a
- specs:
- simple_form (2.0.2)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
-
GIT
remote: https://github.com/jeremydurham/custom-err-msg.git
revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
@@ -776,7 +768,6 @@ DEPENDENCIES
select2-rails (~> 3.4.7)
selenium-webdriver
shoulda-matchers
- simple_form!
simplecov
spinjs-rails
spree_core!
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
deleted file mode 100644
index 59c7d2528b..0000000000
--- a/config/initializers/simple_form.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
- # Wrappers are used by the form builder to generate a
- # complete input. You can remove any component from the
- # wrapper, change the order or even add your own to the
- # stack. The options given below are used to wrap the
- # whole input.
- config.wrappers :default, :class => :input,
- :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
- ## Extensions enabled by default
- # Any of these extensions can be disabled for a
- # given input by passing: `f.input EXTENSION_NAME => false`.
- # You can make any of these extensions optional by
- # renaming `b.use` to `b.optional`.
-
- # Determines whether to use HTML5 (:email, :url, ...)
- # and required attributes
- b.use :html5
-
- # Calculates placeholders automatically from I18n
- # You can also pass a string as f.input :placeholder => "Placeholder"
- b.use :placeholder
-
- ## Optional extensions
- # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
- # to the input. If so, they will retrieve the values from the model
- # if any exists. If you want to enable the lookup for any of those
- # extensions by default, you can change `b.optional` to `b.use`.
-
- # Calculates maxlength from length validations for string inputs
- b.optional :maxlength
-
- # Calculates pattern from format validations for string inputs
- b.optional :pattern
-
- # Calculates min and max from length validations for numeric inputs
- b.optional :min_max
-
- # Calculates readonly automatically from readonly attributes
- b.optional :readonly
-
- ## Inputs
- b.use :label_input
- b.use :hint, :wrap_with => { :tag => :span, :class => :hint }
- b.use :error, :wrap_with => { :tag => :span, :class => :error }
- end
-
- # The default wrapper to be used by the FormBuilder.
- config.default_wrapper = :default
-
- # Define the way to render check boxes / radio buttons with labels.
- # Defaults to :nested for bootstrap config.
- # :inline => input + label
- # :nested => label > input
- config.boolean_style = :nested
-
- # Default class for buttons
- config.button_class = 'btn'
-
- # Method used to tidy up errors. Specify any Rails Array method.
- # :first lists the first message for each field.
- # Use :to_sentence to list all errors for each field.
- # config.error_method = :first
-
- # Default tag used for error notification helper.
- config.error_notification_tag = :div
-
- # CSS class to add for error notification helper.
- config.error_notification_class = 'alert alert-error'
-
- # ID to add for error notification helper.
- # config.error_notification_id = nil
-
- # Series of attempts to detect a default label method for collection.
- # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
-
- # Series of attempts to detect a default value method for collection.
- # config.collection_value_methods = [ :id, :to_s ]
-
- # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
- # config.collection_wrapper_tag = nil
-
- # You can define the class to use on all collection wrappers. Defaulting to none.
- # config.collection_wrapper_class = nil
-
- # You can wrap each item in a collection of radio/check boxes with a tag,
- # defaulting to :span. Please note that when using :boolean_style = :nested,
- # SimpleForm will force this option to be a label.
- # config.item_wrapper_tag = :span
-
- # You can define a class to use in all item wrappers. Defaulting to none.
- # config.item_wrapper_class = nil
-
- # How the label text should be generated altogether with the required text.
- # config.label_text = lambda { |label, required| "#{required} #{label}" }
-
- # You can define the class to use on all labels. Default is nil.
- config.label_class = 'control-label'
-
- # You can define the class to use on all forms. Default is simple_form.
- # config.form_class = :simple_form
-
- # You can define which elements should obtain additional classes
- # config.generate_additional_classes_for = [:wrapper, :label, :input]
-
- # Whether attributes are required by default (or not). Default is true.
- # config.required_by_default = true
-
- # Tell browsers whether to use default HTML5 validations (novalidate option).
- # Default is enabled.
- config.browser_validations = false
-
- # Collection of methods to detect if a file type was given.
- # config.file_methods = [ :mounted_as, :file?, :public_filename ]
-
- # Custom mappings for input types. This should be a hash containing a regexp
- # to match as key, and the input type that will be used when the field name
- # matches the regexp as value.
- # config.input_mappings = { /count/ => :integer }
-
- # Default priority for time_zone inputs.
- # config.time_zone_priority = nil
-
- # Default priority for country inputs.
- # config.country_priority = nil
-
- # Default size for text inputs.
- # config.default_input_size = 50
-
- # When false, do not use translations for labels.
- # config.translate_labels = true
-
- # Automatically discover new inputs in Rails' autoload path.
- # config.inputs_discovery = true
-
- # Cache SimpleForm inputs discovery
- # config.cache_discovery = !Rails.env.development?
-end
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
deleted file mode 100644
index 9810cea163..0000000000
--- a/config/locales/simple_form.en.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-en:
- simple_form:
- "yes": 'Yes'
- "no": 'No'
- required:
- text: 'required'
- mark: '*'
- # You can uncomment the line below if you need to overwrite the whole required html.
- # When using html, text and mark won't be used.
- # html: '*'
- error_notification:
- default_message: "Please review the problems below:"
- # Labels and hints examples
- # labels:
- # defaults:
- # password: 'Password'
- # user:
- # new:
- # email: 'E-mail to sign in.'
- # edit:
- # email: 'E-mail.'
- # hints:
- # defaults:
- # username: 'User name to sign in.'
- # password: 'No special characters, please.'
diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb
deleted file mode 100644
index 201a069e2c..0000000000
--- a/lib/templates/erb/scaffold/_form.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
- <%%= f.error_notification %>
-
-
- <%- attributes.each do |attribute| -%>
- <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
- <%- end -%>
-
-
-
- <%%= f.button :submit %>
-
-<%% end %>