From 85973f4f37c8b94422f267654018d0d7f88ba32b Mon Sep 17 00:00:00 2001 From: slice Date: Sun, 31 Mar 2019 22:30:46 -0700 Subject: Improvements to image upload validation and creation (#10431) * Check if image value is nil? before creating an image Check if uploaded images aren't nil before creating SiteUpload models for them. * Validate presence of file in SiteUpload * Fix file presence validation * Fabricate SiteUpload#file * Add link to Creative Commons license --- app/models/form/admin_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/form') diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 85a6e6dff..d3af8c30f 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -67,7 +67,7 @@ class Form::AdminSettings KEYS.each do |key| value = instance_variable_get("@#{key}") - if UPLOAD_KEYS.include?(key) + if UPLOAD_KEYS.include?(key) && !value.nil? upload = SiteUpload.where(var: key).first_or_initialize(var: key) upload.update(file: value) else -- cgit