aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/export/base.rb
diff options
context:
space:
mode:
authorZog2018-05-25 15:09:20 +0200
committerZog2018-05-25 15:09:20 +0200
commit5a6ce6804f9d86c7dbb21ed20ebc08dbce552a91 (patch)
treeefc277289a196a07bf12bc97b25d804344e2b330 /app/models/export/base.rb
parentc1ebc713fd0eb4692d679fc80e184cb802c98602 (diff)
downloadchouette-core-5a6ce6804f9d86c7dbb21ed20ebc08dbce552a91.tar.bz2
Refs #7159; Updte options for netex exports
Diffstat (limited to 'app/models/export/base.rb')
-rw-r--r--app/models/export/base.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/export/base.rb b/app/models/export/base.rb
index c65539635..6afa6b8e0 100644
--- a/app/models/export/base.rb
+++ b/app/models/export/base.rb
@@ -52,7 +52,7 @@ class Export::Base < ActiveRecord::Base
begin
klass_name.constantize
rescue => e
- Rails.logger.info "Failed: #{e.message}"
+ Rails.logger.info "Failed: #{e.message}".red
nil
end
end
@@ -83,10 +83,18 @@ class Export::Base < ActiveRecord::Base
end
if !!opts[:required]
- validates name, presence: true
+ if opts[:depends]
+ validates name, presence: true, if: ->(record){ record.send(opts[:depends][:option]) == opts[:depends][:value]}
+ else
+ validates name, presence: true
+ end
end
@options ||= {}
@options[name] = opts
+
+ if block_given?
+ yield Export::OptionProxy.new(self, opts.update(name: name))
+ end
end
def self.options