Merge branch 'AI3147-edit_profile_bug' into 'master'

AI3147 edit profile bug Added support for mass-assignment for all of person's, community's and enterprise's fields. Before this, if a environment admin enabled all fields on the fields environment page, you got an error when trying to edit a profile. The Action Item was created at: http://noosfero.org/Development/ActionItem3147

Merge branch 'AI3147-edit_profile_bug' into 'master'
AI3147 edit profile bug Added support for mass-assignment for all of person's, community's and enterprise's fields. Before this, if a environment admin enabled all fields on the fields environment page, you got an error when trying to edit a profile. The Action Item was created at: http://noosfero.org/Development/ActionItem3147
Antonio Terceiro
2 parents 247ad826 0d740187
Showing 4 changed files with 36 additions and 7 deletions Show diff stats
app/models/community.rb
app/models/enterprise.rb
app/models/person.rb
test/functional/profile_editor_controller_test.rb
 class Community < Organization
-  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
+  attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
   after_destroy :check_invite_member_for_destroy
   def self.type_name
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
+
   SEARCH_DISPLAYS += %w[map full]
   def self.type_name
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
-  attr_accessible :organization, :contact_information, :sex, :birth_date
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
   SEARCH_FILTERS += %w[
     more_popular
@@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end
 class ProfileEditorControllerTest < ActionController::TestCase
   all_fixtures
-  
+
   def setup
     @controller = ProfileEditorController.new
     @request    = ActionController::TestRequest.new
@@ -20,11 +20,11 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   def test_local_files_reference
     assert_local_files_reference :get, :index, :profile => profile.identifier
   end
-  
+
   def test_valid_xhtml
     assert_valid_xhtml
   end
-  
+
   def test_index
     get :index, :profile => profile.identifier
     assert_template 'index'
@@ -50,7 +50,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   end
   should 'saving profile info' do
-    person = profile 
+    person = profile
     post :edit, :profile => profile.identifier, :profile_data => { 'name' => 'new person', 'contact_information' => 'new contact information', 'address' => 'new address', 'sex' => 'female' }
     assert_redirected_to :controller => 'profile_editor', :action => 'index'
     person = Person.find(person.id)
@@ -60,6 +60,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_equal 'female', person.sex
   end
+  should 'mass assign all environment configurable person fields' do
+    person = profile
+
+    post :edit, :profile => profile.identifier, :profile_data => { "nickname" => "ze", "description" => "Just a regular ze.", "contact_information" => "What?", "contact_phone" => "+0551133445566", "cell_phone" => "+0551188889999", "comercial_phone" => "+0551144336655", "jabber_id" => "ze1234", "personal_website" => "http://ze.com.br", "sex" => "male", "birth_date" => "2014-06-04", "nationality" => "Brazilian", "country" => "BR", "state" => "DF", "city" => "Brasilia", "zip_code" => "70300-010", "address" => "Palacio do Planalto", "address_reference" => "Praca dos tres poderes", "district" => "DF", "schooling" => "Undergraduate", "schooling_status" => "Concluded", "formation" => "Engineerings", "area_of_study" => "Metallurgy", "professional_activity" => "Metallurgic", "organization" => "Metal Corp.", "organization_website" => "http://metal.com" }
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'not permmit if not logged' do
     logout
     get :index, :profile => profile.identifier
@@ -164,6 +173,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]', :value => 'my contact' }
   end
+  should 'mass assign all environment configurable community fields' do
+    cmm = fast_create(Community)
+
+    post :edit, :profile => cmm.identifier, :profile_data => { "name" => "new name", "display_name" => "N&w N@me", "description"=>"We sell food and other stuff.", "contact_person"=>"Joseph of the Jungle", "contact_email"=>"sac@company.net", "contact_phone"=>"+0551133445566", "legal_form"=>"New Name corp.", "economic_activity"=>"Food", "management_information"=>"No need for that here.", "address"=>"123, baufas street", "address_reference"=>"Next to baufas house", "district"=>"DC", "zip_code"=>"123456", "city"=>"Whashington", "state"=>"DC", "country"=>"US", "tag_list"=>"food, corporations", "language"=>"English" }
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'show field values on edit enterprise info' do
     Enterprise.any_instance.expects(:active_fields).returns(['contact_person']).at_least_once
     org = fast_create(Enterprise)
@@ -173,6 +191,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'profile_data[contact_person]', :value => 'my contact' }
   end
+  should 'mass assign all environment configurable enterprise fields' do
+    enterprise = fast_create(Enterprise)
+
+    post :edit, :profile => enterprise.identifier, :profile_data => { "name"=>"Enterprise", "display_name"=>"Enterprise name", "business_name"=>"Enterprise", "description"=>"Hello IT.", "contact_person"=>"Joseph", "contact_email"=>"joe@enterprise.net", "contact_phone"=>"+0551133445566", "legal_form"=>"Enterprise corp.", "economic_activity"=>"Food", "management_information"=>"None.", "address"=>"123, baufas street", "address_reference"=>"Next to baufas house", "district"=>"DC", "zip_code"=>"123456", "city"=>"Washington", "state"=>"DC", "country"=>"US", "tag_list"=>"food, corporations", "organization_website"=>"http://enterprise.net", "historic_and_current_context"=>"Historic.", "activities_short_description"=>"Activies.", "acronym"=>"E", "foundation_year"=>"1995",}
+
+    assert_response :redirect
+    assert_redirected_to :controller => 'profile_editor', :action => 'index'
+  end
+
   should 'display profile publication option in edit profile screen' do
     get :edit, :profile => profile.identifier
     assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' }
@@ -426,7 +453,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     get :index, :profile => ent.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{ent.identifier}/profile_editor/enable" }
   end
-  
+
   should 'link to disable enterprise' do
     ent = fast_create(Enterprise, :enabled => true)
     get :index, :profile => ent.identifier
1	class Community < Organization	1	class Community < Organization
2		2
3	- attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type	3	+ attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type, :address_reference, :district, :tag_list, :language
4	after_destroy :check_invite_member_for_destroy	4	after_destroy :check_invite_member_for_destroy
5		5
6	def self.type_name	6	def self.type_name
	@@ -2,6 +2,8 @@		@@ -2,6 +2,8 @@
2	# only enterprises can offer products and services.	2	# only enterprises can offer products and services.
3	class Enterprise < Organization	3	class Enterprise < Organization
4		4
		5	+ attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
		6	+
5	SEARCH_DISPLAYS += %w[map full]	7	SEARCH_DISPLAYS += %w[map full]
6		8
7	def self.type_name	9	def self.type_name
1	# A person is the profile of an user holding all relationships with the rest of the system	1	# A person is the profile of an user holding all relationships with the rest of the system
2	class Person < Profile	2	class Person < Profile
3		3
4	- attr_accessible :organization, :contact_information, :sex, :birth_date	4	+ attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website
5		5
6	SEARCH_FILTERS += %w[	6	SEARCH_FILTERS += %w[
7	more_popular	7	more_popular