From 59d318b953d6eaf99dc29552bc3ea16a974d45a7 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Tue, 2 Sep 2014 15:51:51 +0300 Subject: [PATCH] No need for exception for setting --- app/models/concerns/epp_errors.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/concerns/epp_errors.rb b/app/models/concerns/epp_errors.rb index 533502d32..e6debf67f 100644 --- a/app/models/concerns/epp_errors.rb +++ b/app/models/concerns/epp_errors.rb @@ -33,13 +33,8 @@ module EppErrors next unless code = find_epp_code(err) err = { code: code, msg: err } - # If we have setting relation, then still add the value to the error message - # If this sort of exception happens again, some other logic has to be implemented - if self.class.reflect_on_association(key) && key == :setting - err[:value] = { val: send(key).value, obj: self.class::EPP_ATTR_MAP[key] } - - # if the key represents other relations, skip value - elsif !self.class.reflect_on_association(key) + # if the key represents relations, skip value + unless self.class.reflect_on_association(key) err[:value] = { val: send(key), obj: self.class::EPP_ATTR_MAP[key] } end