Remove rule parameter set from models

Refs #4516

4 files changed, 4 insertions, 25 deletions

diff --git a/app/models/import_task.rb b/app/models/import_task.rb
index 0e1ab65be..7dfa2c644 100644
--- a/app/models/import_task.rb
+++ b/app/models/import_task.rb
@@ -12,7 +12,7 @@ class ImportTask
   cattr_accessor :root
 
   enumerize :data_format, in: %w( neptune netex gtfs )
-  attr_accessor :rule_parameter_set_id, :referential_id, :user_id, :user_name, :data_format, :resources, :name, :no_save
+  attr_accessor :referential_id, :user_id, :user_name, :data_format, :resources, :name, :no_save
 
   validates_presence_of :referential_id
   validates_presence_of :resources
@@ -34,10 +34,6 @@ class ImportTask
     referential.organisation
   end
 
-  def rule_parameter_set
-    organisation.rule_parameter_sets.find(rule_parameter_set_id) if rule_parameter_set_id.present?
-  end
-
   def save
     if valid?
       # Save resources
@@ -68,20 +64,10 @@ class ImportTask
 
   def params
     {}.tap do |h|
-      h["parameters"] = validation_params ? action_params.merge(validation_params) : action_params
+      h["parameters"] = {}
     end
   end
 
-  def action_params
-    {}
-  end
-
-  def validation_params
-    {
-      "validation" => rule_parameter_set.parameters
-    } if rule_parameter_set.present?
-  end
-
   def self.data_formats
     self.data_format.values
   end
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 582133ed3..b0c0692da 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -3,7 +3,6 @@ class Organisation < ActiveRecord::Base
 
   has_many :users, :dependent => :destroy
   has_many :referentials, :dependent => :destroy
-  # has_many :rule_parameter_sets, :dependent => :destroy
   has_many :compliance_control_sets, :dependent => :destroy
 
   has_many :stop_area_referential_memberships
diff --git a/app/views/import_tasks/new.html.slim b/app/views/import_tasks/new.html.slim
index b4b77d344..dad004759 100644
--- a/app/views/import_tasks/new.html.slim
+++ b/app/views/import_tasks/new.html.slim
@@ -16,13 +16,12 @@ ul.nav.nav-pills
         = form.input :referential_id, as: :hidden, :input_html => { :value => @referential.id }
         = form.input :name
         = form.input :no_save, as: :boolean
-        = form.input :rule_parameter_set_id, as: :select, :collection =>  @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true
         = form.input :resources, as: :file
 
       = render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form }
-      
+
       = form.actions do
         = form.action :submit, as: :button , :label => t( 'formtastic.import' )
         = form.action :cancel, as: :link
 
-= javascript_include_tag new_referential_import_task_path(@referential, :format => :js)
\ No newline at end of file
+= javascript_include_tag new_referential_import_task_path(@referential, :format => :js)
diff --git a/app/views/organisations/show.html.slim b/app/views/organisations/show.html.slim
index 89e3b2870..e7ab18dd3 100644
--- a/app/views/organisations/show.html.slim
+++ b/app/views/organisations/show.html.slim
@@ -27,8 +27,3 @@
         = link_to t('organisations.actions.edit'), edit_organisation_path, class: 'edit'
       li
         = link_to t('users.actions.new'), new_organisation_user_path, class: 'add'
-
-    / FIXME ref #2007
-    - if false
-      li
-        = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add'