Download as
Browse Code »

Commit 503946eef3e96e1c0b28379395ff297ae503aeae

Authored by Thiago Ribeiro
2 parents 617cf061 49d77327
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

Merge branch 'fix_institution_registration' into 'master' 

Fix institution registration

See merge request !4
Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
public/views/create-institution.js
  Diff comments   View file @503946e
... ... @@ -126,13 +126,15 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
126 126 var error_keys = Object.keys(errors);
127 127  
128 128 // (field)|(field)|...
129   - var verify_error = new RegExp("(" + error_keys.join(")|(") + ")" );
  129 + var verify_error = new RegExp("(\\[" + error_keys.join("\\])|(\\[") + "\\])" );
130 130  
131 131 var fields_with_errors = $("#institution_dialog .formfield input").filter(function(index, field) {
  132 + $(field).removeClass("highlight-error");
132 133 return verify_error.test(field.getAttribute("name"));
133 134 });
134 135  
135 136 var selects_with_errors = $("#institution_dialog .formfield select").filter(function(index, field) {
  137 + $(field).removeClass("highlight-error");
136 138 return verify_error.test(field.getAttribute("name"));
137 139 });
138 140  
... ... @@ -396,7 +398,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
396 398 set_form_count_custom_data();
397 399 set_events();
398 400 },
399   -
  401 +
400 402 institution_autocomplete: function(){
401 403 institution_autocomplete();
402 404 }
... ...
test/functional/gov_user_plugin_controller_test.rb
  Diff comments   View file @503946e
... ... @@ -100,26 +100,24 @@ class GovUserPluginControllerTest < ActionController::TestCase
100 100 assert json_response["success"]
101 101 end
102 102  
103   - should "not create a institution that already exists" do
  103 + should "create a institution without cnpj" do
104 104 @controller.stubs(:verify_recaptcha).returns(true)
105 105  
106 106 fields = InstitutionTestHelper.generate_form_fields(
107   - "Ministerio Publico da Uniao",
  107 + "Some Private Institution",
108 108 "BR",
109 109 "DF",
110 110 "Brasilia",
111   - "12.234.567/8900-10",
112   - "PublicInstitution"
  111 + "",
  112 + "PrivateInstitution"
113 113 )
114   - fields[:institutions][:governmental_power] = @gov_power.id
115   - fields[:institutions][:governmental_sphere] = @gov_sphere.id
116   - fields[:institutions][:juridical_nature] = @juridical_nature.id
  114 + fields[:institutions][:acronym] = "SPI"
117 115  
118 116 xhr :get, :new_institution, fields
119 117  
120 118 json_response = ActiveSupport::JSON.decode(@response.body)
121 119  
122   - assert !json_response["success"]
  120 + assert json_response["success"]
123 121 end
124 122  
125 123 should "verify if institution name already exists" do
... ...