From 5a6ce6804f9d86c7dbb21ed20ebc08dbce552a91 Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 25 May 2018 15:09:20 +0200
Subject: Refs #7159; Updte options for netex exports

---
 app/models/export/base.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'app/models/export/base.rb')

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
-- 
cgit v1.2.3