diff options
| author | Michel Etienne | 2015-03-19 16:53:18 +0100 |
|---|---|---|
| committer | Michel Etienne | 2015-03-19 16:53:18 +0100 |
| commit | 08a2ffbc8555c854dec84238e7e51ff7e3988fd7 (patch) | |
| tree | 60de05a99c15e69f68ecfbd55579cb7bbef8311a | |
| parent | a60f31997f03f9669c856573a43f7f14e7687e20 (diff) | |
| download | chouette-core-08a2ffbc8555c854dec84238e7e51ff7e3988fd7.tar.bz2 | |
new import fails to access rule_parameter_sets
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/views/import_tasks/new.html.erb | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -14,7 +14,7 @@ end platforms :ruby do gem 'therubyracer', '~> 0.10.2' - gem 'pg', '~> 0.11.0' + gem 'pg', '~> 0.18.1' gem 'sqlite3' end diff --git a/Gemfile.lock b/Gemfile.lock index d1c830568..d978a2021 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,7 +221,7 @@ GEM nokogiri (1.5.10-java) open4 (1.3.0) orm_adapter (0.4.0) - pg (0.11.0) + pg (0.18.1) polyamorous (1.1.0) activerecord (>= 3.0) polyglot (0.3.5) @@ -430,7 +430,7 @@ DEPENDENCIES modernizr-rails (~> 2.0.6) morrisjs-rails ninoxe (= 1.1.5) - pg (~> 0.11.0) + pg (~> 0.18.1) rabl rails (= 3.2.18) rails-assets-bootstrap-sass-official (~> 3.3.0) diff --git a/app/views/import_tasks/new.html.erb b/app/views/import_tasks/new.html.erb index 65daee0ca..214c4f5a0 100644 --- a/app/views/import_tasks/new.html.erb +++ b/app/views/import_tasks/new.html.erb @@ -17,7 +17,7 @@ <%= form.input :format, :as => :hidden %> <%= form.input :no_save, :as => :boolean, :collection => [true, false] %> <%= form.input :rule_parameter_set_id, :as => :select, - :collection => @referential.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true %> + :collection => @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true %> <%= form.input :resources, :as => :file %> <% unless import_task.references_types.empty? %> |
