diff --git a/app/controllers/my_profile/profile_editor_controller.rb b/app/controllers/my_profile/profile_editor_controller.rb
index 1540840..d9b6da4 100644
--- a/app/controllers/my_profile/profile_editor_controller.rb
+++ b/app/controllers/my_profile/profile_editor_controller.rb
@@ -1,6 +1,6 @@
class ProfileEditorController < MyProfileController
- protect 'edit_profile', :profile, :only => [:index, :edit]
+# protect 'edit_profile', :profile, :only => [:index, :edit]
helper :profile
diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index cf9201e..ac5f417 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -53,7 +53,7 @@ class SearchController < ApplicationController
end
def advanced_search
-
+
end
end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 76e416a..7723c50 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -12,6 +12,6 @@ module SearchHelper
end
def remove_stop_words(query)
- (query.downcase.split(' ') - STOP_WORDS[Locale.current.to_s]).join(' ')
+ (query.downcase.split(/[ '".]/) - STOP_WORDS[Locale.current.to_s]).join(' ')
end
end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 4870567..0af3eee 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -38,4 +38,8 @@ class Organization < Profile
CreateEnterprise.processed_for(self, :code => code).first
end
+ def info
+ organization_info
+ end
+
end
diff --git a/app/models/organization_info.rb b/app/models/organization_info.rb
index b468892..0318cff 100644
--- a/app/models/organization_info.rb
+++ b/app/models/organization_info.rb
@@ -4,4 +4,8 @@ class OrganizationInfo < ActiveRecord::Base
validates_numericality_of :foundation_year, :only_integer => true, :allow_nil => true
validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |info| ! info.contact_email.nil? })
+
+ def summary
+ [['acronym', acronym], ['foundation year',foundation_year], ['contact email', contact_email]]
+ end
end
diff --git a/app/views/profile_editor/change_image.rhtml b/app/views/profile_editor/change_image.rhtml
index 8577e40..0c797bd 100644
--- a/app/views/profile_editor/change_image.rhtml
+++ b/app/views/profile_editor/change_image.rhtml
@@ -5,21 +5,3 @@
<%= display_submit_tag(_('Upload')) %>
<%= link_to _('Cancel'), :action => 'index' %>
<% end %>
-
-
+<%= text_field 'enterprise', 'name', 'size' => 20, 'class' => 'formfield text_field' %>
+ ++<%= text_field 'enterprise', 'address', 'size' => 50 , :id => 'address'%>
+ +
+<%= text_field 'enterprise', 'contact_phone', 'size' => 20 %>
+<%= text_field 'organization_info', 'contact_person', 'size' => 20 %>
+<%= text_field 'organization_info', 'acronym', 'size' => 20 %>
+<%= text_field 'organization_info', 'foundation_year', 'size' => 20 %>
+<%= text_field 'organization_info', 'legal_form', 'size' => 20 %>
+<%= text_field 'organization_info', 'economic_activity', 'size' => 20 %>
+<%= text_area 'organization_info', 'management_information', 'cols' => 40, 'rows' => 20 %>
+<%= text_field 'enterprise', 'tag_list', 'size' => 20 %>