diff options
| author | Marc Florisson | 2014-02-03 14:02:19 +0100 |
|---|---|---|
| committer | Marc Florisson | 2014-02-03 14:02:19 +0100 |
| commit | 6a4b1db7cc5b45a036dd3e8d37fc5baac663fc67 (patch) | |
| tree | 5ba938dd6ec8d6ea132bd36e63bb12a894761eef | |
| parent | a627367549cd3eefb4f467cf7448d8eb618b5be1 (diff) | |
| download | chouette-core-6a4b1db7cc5b45a036dd3e8d37fc5baac663fc67.tar.bz2 | |
remove import on refrential creation form
| -rw-r--r-- | app/models/referential.rb | 8 | ||||
| -rw-r--r-- | app/views/referentials/_form.erb | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb index bc151b001..c8e209afd 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -14,7 +14,6 @@ class Referential < ActiveRecord::Base validates_format_of :lower_corner, :with => %r{\A-?[0-9]+\.?[0-9]*\,-?[0-9]+\.?[0-9]*\Z} validate :slug_excluded_values - attr_accessor :resources attr_accessor :upper_corner attr_accessor :lower_corner @@ -144,13 +143,6 @@ class Referential < ActiveRecord::Base Apartment::Database.drop slug end - after_create :import_resources, :add_rule_parameter_set - def import_resources - import_tasks.create(:resources => resources, :no_save => false, - :format => "Neptune", :user_id => user_id, - :user_name => user_name) if resources - end - def add_rule_parameter_set RuleParameterSet.default_for_all_modes( self).save end diff --git a/app/views/referentials/_form.erb b/app/views/referentials/_form.erb index 5b59ad5f8..58cefa925 100644 --- a/app/views/referentials/_form.erb +++ b/app/views/referentials/_form.erb @@ -1,6 +1,6 @@ <%= semantic_form_for @referential do |form| %> - <%= form.inputs do %> - <%= form.input :name %> + <%= form.inputs do %> + <%= form.input :name %> <% if @referential.new_record? %> <%= form.input :slug%> <% else %> @@ -11,17 +11,13 @@ <% end %> <%= form.input :prefix %> <%= form.input :projection_type, :as => :select, :collection => Referential.available_srids %> - <%= form.input :time_zone %> - <%= form.input :upper_corner %> + <%= form.input :time_zone %> + <%= form.input :upper_corner %> <%= form.input :lower_corner %> - - <% if @referential.new_record? %> - <%= form.input :resources, :as => :file %> - <% end %> <% end %> <%= form.actions do %> <%= form.action :submit, :as => :button %> <%= form.action :cancel, :as => :link %> <% end %> -<% end %>
\ No newline at end of file +<% end %> |