Merge pull request #125 from dpn-admin/fix/issue_124

Fix/issue 124
dpn-admin · Oct 28, 2016 · 1c3039d · 1c3039d
2 parents ec4ea9b + 51db157
commit 1c3039d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/app/adapters/adapter.rb b/app/adapters/adapter.rb
@@ -20,6 +20,7 @@ def map_simple(model_field, public_field)
   # @param [Symbol] public_field
   # @param [String] date_format The Date format to use.
   def map_date(model_field, public_field, date_format)
+    raise ArgumentError, "date_format cannot be nil" if date_format.nil?
     map_from_public public_field do |value|
       {model_field => time_from_public(value)}
     end

diff --git a/config/application.rb b/config/application.rb
@@ -46,6 +46,8 @@ class Application < Rails::Application
           :request_specs => true
       end
 
+      require_relative 'time_formats'
+
     end
   end
 end
diff --git a/config/initializers/time_formats.rb → config/time_formats.rb b/config/initializers/time_formats.rb → config/time_formats.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ class Application < Rails::Application @@
               :request_specs => true
           end
+          require_relative 'time_formats'
         end
       end
     end