[Git][noosfero/noosfero][master] 3 commits: Removes unnecessary schooling option

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
ace5c5f1 by MatheusRich at 2018-08-24T13:25:53Z
Removes unnecessary schooling option

Signed-off-by: alaxalves <alaxallves at gmail.com>

- - - - -
440fde04 by alaxalves at 2018-08-24T13:50:04Z
Fixing schooling selector layout

Signed-off-by: Matheus Richard <matheusrichardt at gmail.com>

- - - - -
2b278d0e by Rodrigo Souto at 2018-08-27T18:32:40Z
Merge branch 'duplicated-fields' into 'master'

Removes Duplicated Schooling Option

See merge request noosfero/noosfero!1601
- - - - -


3 changed files:

- app/helpers/profile_editor_helper.rb
- public/designs/themes/base/stylesheets/profile-editor.scss
- test/functional/profile_editor_controller_test.rb


Changes:

=====================================
app/helpers/profile_editor_helper.rb
=====================================
@@ -84,7 +84,6 @@ module ProfileEditorHelper
     N_('Post-Doctoral'),
     N_('Ph.D.'),
     N_('Masters'),
-    N_('Undergraduate'),
     N_('Graduate'),
     N_('High School'),
     N_('Elementary School')


=====================================
public/designs/themes/base/stylesheets/profile-editor.scss
=====================================
@@ -0,0 +1,4 @@
+#profile_data_schooling, #profile_data_schooling_status {
+  width: 100%;
+  margin-bottom: 5px;
+}


=====================================
test/functional/profile_editor_controller_test.rb
=====================================
@@ -43,7 +43,16 @@ class ProfileEditorControllerTest < ActionController::TestCase
 
   should 'mass assign all environment configurable person fields' do
     person = profile
-    post :informations, :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" }
+    post :informations, :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" => "Graduate", "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'



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/3233de53c1866a3489773cbba69d0a9654bc8e08...2b278d0ebf9437048680d869dcbf7495903414ea

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/3233de53c1866a3489773cbba69d0a9654bc8e08...2b278d0ebf9437048680d869dcbf7495903414ea
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180827/e2a4d6a8/attachment-0001.html>