diff --git a/app/models/organization.rb b/app/models/organization.rb
index d5f4002..4870567 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -15,13 +15,11 @@ class Organization < Profile
end
def validation_methodology
- methodology = self.validation_info ? self.validation_info.validation_methodology : nil
- methodology || ('' + _('(not informed)') + '')
+ self.validation_info ? self.validation_info.validation_methodology : nil
end
def validation_restrictions
- restrictions = self.validation_info ? self.validation_info.restrictions : nil
- restrictions || ('' + _('(not informed)') + '')
+ self.validation_info ? self.validation_info.restrictions : nil
end
def pending_validations
diff --git a/app/views/enterprise_registration/select_validator.rhtml b/app/views/enterprise_registration/select_validator.rhtml
index a844a96..4f02f0b 100644
--- a/app/views/enterprise_registration/select_validator.rhtml
+++ b/app/views/enterprise_registration/select_validator.rhtml
@@ -12,8 +12,8 @@
<%= radio_button_tag('create_enterprise[target_id]', validator.id) %>
<%= validator.name %>
- <%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology) %>
- <%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions) %>
+ <%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology || _("(not informed)")) %>
+ <%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions || _("(not informed)")) %>
<% end %>
diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
index 3a1c056..cef60fc 100644
--- a/test/unit/organization_test.rb
+++ b/test/unit/organization_test.rb
@@ -35,7 +35,7 @@ class OrganizationTest < Test::Unit::TestCase
should 'provide validation methodology' do
org = Organization.new
- assert_equal '(not informed)', org.validation_methodology
+ assert_nil org.validation_methodology
info = ValidationInfo.new
info.expects(:validation_methodology).returns('something')
@@ -45,7 +45,7 @@ class OrganizationTest < Test::Unit::TestCase
should 'provide validation restrictions' do
org = Organization.new
- assert_equal '(not informed)', org.validation_restrictions
+ assert_nil org.validation_restrictions
info = ValidationInfo.new
info.expects(:restrictions).returns('something')
--
libgit2 0.21.2