Download as
Browse Code »

Commit 9198bbb93bebb26387b67a387abb1f5ba222fd70

Authored by David Silva
Committed by Fabio Teixeira
1 parent 36475a0e
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

correcoes_aderencia: Hide field "city" when country isn't Brazil. 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 2 changed files with 37 additions and 1 deletions   Show diff stats
features/user_profile_edition.feature
  Diff comments   View file @9198bbb
... ... @@ -10,6 +10,11 @@ Feature: Institution Field
10 10 And I check "MpogSoftwarePlugin"
11 11 And I press "Save changes"
12 12 And feature "skip_new_user_email_confirmation" is enabled on environment
  13 + And I go to /admin/features/manage_fields
  14 + And I check "person_fields_country_active"
  15 + And I check "person_fields_state_active"
  16 + And I check "person_fields_city_active"
  17 + And I press "Save changes"
13 18 And I go to /account/logout
14 19 And Institutions has initial default values on database
15 20 And the following public institutions
... ... @@ -47,4 +52,18 @@ Feature: Institution Field
47 52 Scenario: Verify text information to use governmental e-mail
48 53 Given I am on josesilva's control panel
49 54 And I follow "Edit Profile"
50   - Then I should see "If you work in a public agency use your government e-Mail"
51 55 \ No newline at end of file
  56 + Then I should see "If you work in a public agency use your government e-Mail"
  57 +
  58 + @selenium
  59 + Scenario: Verify if field 'city' is shown when Brazil is selected
  60 + Given I am on josesilva's control panel
  61 + And I follow "Edit Profile"
  62 + Then I should see "City"
  63 +
  64 + @selenium
  65 + Scenario: Verify if field 'city' does not appear when Brazil is not selected as country
  66 + Given I am on josesilva's control panel
  67 + When I follow "Edit Profile"
  68 + And I select "United States" from "profile_data_country"
  69 + And I sleep for 1 seconds
  70 + Then I should not see "City"
... ...
public/mpog-user-validations.js
  Diff comments   View file @9198bbb
... ... @@ -38,6 +38,13 @@
38 38 });
39 39 }
40 40  
  41 + function hide_city(){
  42 + jQuery("#city_field").parent().parent().parent().hide();
  43 + }
  44 + function show_city(){
  45 + jQuery("#city_field").parent().parent().parent().show();
  46 + }
  47 +
41 48 function replace_state_with_input() {
42 49 replace_with(input_select);
43 50 }
... ... @@ -53,6 +60,14 @@
53 60  
54 61 setInput : function() {
55 62 replace_state_with_input();
  63 + },
  64 +
  65 + setHideCity : function(){
  66 + hide_city();
  67 + },
  68 +
  69 + setShowCity : function(){
  70 + show_city();
56 71 }
57 72 }
58 73 }
... ... @@ -255,8 +270,10 @@
255 270 jQuery("#profile_data_country").change(function(){
256 271 if( this.value == "BR" && selectFieldChoices.actualFieldIsInput() ) {
257 272 selectFieldChoices.setSelect();
  273 + selectFieldChoices.setShowCity();
258 274 } else {
259 275 selectFieldChoices.setInput();
  276 + selectFieldChoices.setHideCity();
260 277 }
261 278 });
262 279  
... ...