From 0b8c2b19985e15f935c4b6fb66ddf13891f2a869 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Tue, 11 Nov 2008 14:12:23 -0300 Subject: [PATCH] ActionItem838: removing fields management_information and legal_form --- app/helpers/enterprise_homepage_helper.rb | 2 -- app/views/enterprise_editor/_form.rhtml | 6 ------ app/views/enterprise_editor/index.rhtml | 2 -- app/views/profile_editor/_organization.rhtml | 2 -- test/unit/create_enterprise_test.rb | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/helpers/enterprise_homepage_helper.rb b/app/helpers/enterprise_homepage_helper.rb index b8d6d54..bb46866 100644 --- a/app/helpers/enterprise_homepage_helper.rb +++ b/app/helpers/enterprise_homepage_helper.rb @@ -8,8 +8,6 @@ module EnterpriseHomepageHelper [ _('Phone(s):'), :contact_phone ], [ _('Location:'), :location ], [ _('Address:'), :address ], - [ _('Legal form:'), :legal_form ], - [ _('Foundation year:'), :foundation_year ], [ _('Economic activity:'), :economic_activity ] ].each { | name, att | if profile.send( att ) and not profile.send( att ).blank? diff --git a/app/views/enterprise_editor/_form.rhtml b/app/views/enterprise_editor/_form.rhtml index 5fc5889..d9da0be 100644 --- a/app/views/enterprise_editor/_form.rhtml +++ b/app/views/enterprise_editor/_form.rhtml @@ -16,15 +16,9 @@


<%= text_field 'enterprise', 'foundation_year', 'size' => 20 %>

-


-<%= text_field 'enterprise', 'legal_form', 'size' => 20 %>

-


<%= text_field 'enterprise', 'economic_activity', 'size' => 20 %>

-


-<%= text_area 'enterprise', 'management_information', 'cols' => 40, 'rows' => 20 %>

-


<%= select 'validation_entity', 'id', @validation_entities.map{|v| [v.name, v.id]}, :include_blank => true %>

diff --git a/app/views/enterprise_editor/index.rhtml b/app/views/enterprise_editor/index.rhtml index f98034c..7a5d344 100644 --- a/app/views/enterprise_editor/index.rhtml +++ b/app/views/enterprise_editor/index.rhtml @@ -8,9 +8,7 @@

<%= _('Contact person:') %> <%= @enterprise.contact_person %>

<%= _('Acronym:') %> <%= @enterprise.acronym %>

<%= _('Foundation year:') %> <%= @enterprise.foundation_year %>

-

<%= _('Legal Form:') %> <%= @enterprise.legal_form %>

<%= _('Economic activity:') %> <%= @enterprise.economic_activity %>

-

<%= _('Management infomation:') %> <%= @enterprise.management_information %>

<%= link_to _('Edit enterprise'), :action => 'edit', :id => @enterprise %> <%= help _('Change the information about the enterprise') %> diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml index a47b38d..4d65282 100644 --- a/app/views/profile_editor/_organization.rhtml +++ b/app/views/profile_editor/_organization.rhtml @@ -13,9 +13,7 @@ <%= f.text_field(:foundation_year) %> <%= f.text_field(:contact_person) %> <%= f.text_field(:contact_email) %> - <%= f.text_field(:legal_form) %> <%= f.text_field(:economic_activity) %> - <%= f.text_area(:management_information, :rows => 5) %> <%= f.text_area(:description, :rows => 5) if @profile.kind_of?(Community) %>

<%= _('Moderation options') %>

diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb index 550fb29..299b9a3 100644 --- a/test/unit/create_enterprise_test.rb +++ b/test/unit/create_enterprise_test.rb @@ -5,7 +5,7 @@ class CreateEnterpriseTest < Test::Unit::TestCase should 'provide needed data' do task = CreateEnterprise.new - %w[ name identifier address contact_phone contact_person acronym foundation_year legal_form economic_activity management_information ].each do |field| + %w[ name identifier address contact_phone contact_person acronym foundation_year economic_activity ].each do |field| assert task.respond_to?(field) assert task.respond_to?("#{field}=") end -- libgit2 0.21.2