From 67af40e3b1ec14f3da98fd5acc0303476af9d39a Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Wed, 6 Jun 2012 16:26:22 +0100 Subject: Non-logged-in users can create requests Make the info_request validation a bit more forgiving, so that non- logged-in users may create requests. --- app/models/info_request.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 99cbe476a..6cefc3dab 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -113,9 +113,9 @@ class InfoRequest < ActiveRecord::Base # External requests are requests that have been added using the API, whereas internal # requests are requests made using the site. def must_be_internal_or_external - if user_id.nil? - errors.add(:external_url, "must be provided for an external request") if external_url.nil? - else + # We must permit user_id and external_user_name both to be nil, because the system + # allows a request to be created by a non-logged-in user. + if !user_id.nil? errors.add(:external_user_name, "must be null for an internal request") if !external_user_name.nil? errors.add(:external_url, "must be null for an internal request") if !external_url.nil? end -- cgit v1.2.3