diff options
| author | Robert | 2017-07-14 10:25:32 +0200 |
|---|---|---|
| committer | Robert | 2017-07-17 13:13:29 +0200 |
| commit | 03c2dcba29f1d6b4a8d22bd091e036fcf5600924 (patch) | |
| tree | e384d5a4203bb607839a0727ff856d1eecdde759 /app | |
| parent | df21b37cb3f4c4b56a4873247c5bb2759fd549f7 (diff) | |
| download | chouette-core-03c2dcba29f1d6b4a8d22bd091e036fcf5600924.tar.bz2 | |
Fixes: #3555@1h
- Import#parent_id & #parent_type migration generated
- Import#belongs_to :parent, class_name: to_s specified
- Import#belongs_to :parent, class_name: to_s implemented
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/import_tasks_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/import.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/import_tasks_controller.rb b/app/controllers/import_tasks_controller.rb index 0e3ed6445..cb377ec5a 100644 --- a/app/controllers/import_tasks_controller.rb +++ b/app/controllers/import_tasks_controller.rb @@ -1,4 +1,3 @@ -# coding: utf-8 class ImportTasksController < ChouetteController defaults :resource_class => ImportTask diff --git a/app/models/import.rb b/app/models/import.rb index d0736ab0b..535c676b1 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -3,6 +3,8 @@ class Import < ActiveRecord::Base belongs_to :workbench belongs_to :referential + belongs_to :parent, class_name: to_s + extend Enumerize enumerize :status, in: %i(new pending successful failed running aborted canceled) |