diff options
| author | Zog | 2018-03-09 10:12:48 +0100 |
|---|---|---|
| committer | Zog | 2018-03-12 12:00:15 +0100 |
| commit | f65a9f30f600f092fe3596e9e4db3c015dd91616 (patch) | |
| tree | 60883c3b12a3380d8a5219b032cb640ffc398e41 /app/controllers | |
| parent | 9b1da47adecbfb8d5d148fce06ad1aece18b41d0 (diff) | |
| download | chouette-core-f65a9f30f600f092fe3596e9e4db3c015dd91616.tar.bz2 | |
Refs #6133; Full UX for exports
Also added a *dumb* `WorkgroupExport` for testing purposes.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/iev_interfaces.rb | 6 | ||||
| -rw-r--r-- | app/controllers/exports_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/imports_controller.rb | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/concerns/iev_interfaces.rb b/app/controllers/concerns/iev_interfaces.rb index 590482c7f..aa4d3fe6a 100644 --- a/app/controllers/concerns/iev_interfaces.rb +++ b/app/controllers/concerns/iev_interfaces.rb @@ -28,8 +28,12 @@ module IevInterfaces end protected + def collection - scope = parent.send(collection_name).where(type: "#{resource_class.parent.name}::Workbench") + scope = parent.send(collection_name).where(parent_id: nil) + if index_model.name.demodulize != "Base" + scope = scope.where(type: index_model.name) + end scope = self.ransack_period_range(scope: scope, error_message: t("#{collection_name}.filters.error_period_filter"), query: :where_started_at_in) diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb index 3a91217e4..7ea57341a 100644 --- a/app/controllers/exports_controller.rb +++ b/app/controllers/exports_controller.rb @@ -7,6 +7,10 @@ class ExportsController < ChouetteController private + def index_model + Export::Base + end + def build_resource Export::Base.force_load_descendants if Rails.env.development? @export ||= Export::Base.new(*resource_params) do |export| diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb index f95b6acf1..8d7a723a0 100644 --- a/app/controllers/imports_controller.rb +++ b/app/controllers/imports_controller.rb @@ -15,6 +15,10 @@ class ImportsController < ChouetteController private + def index_model + Import::Workbench + end + def build_resource @import ||= Import::Workbench.new(*resource_params) do |import| import.workbench = parent |