Download as
Browse Code »

Commit 3e0761f4eeba1e8634d5caf13a72611af0109af7

Authored by Fabio Teixeira
1 parent aa66130d
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: Allow blank field on secondary email 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
public/mpog-user-validations.js
  Diff comments   View file @3e0761f
@@ -229,11 +229,11 @@ @@ -229,11 +229,11 @@
229 jQuery("." + hidden_message_id).hide(); 229 jQuery("." + hidden_message_id).hide();
230 } 230 }
231 231
232 - function addBlurFields(field_selector, hidden_message_id, validation_function) { 232 + function addBlurFields(field_selector, hidden_message_id, validation_function, allow_blank) {
233 jQuery(field_selector).blur(function(){ 233 jQuery(field_selector).blur(function(){
234 jQuery(this).attr("class", ""); 234 jQuery(this).attr("class", "");
235 235
236 - if( validation_function(this.value) ) { 236 + if( validation_function(this.value, !!allow_blank) ) {
237 show_plugin_error_message(field_selector, hidden_message_id); 237 show_plugin_error_message(field_selector, hidden_message_id);
238 } else { 238 } else {
239 hide_plugin_error_message(field_selector, hidden_message_id); 239 hide_plugin_error_message(field_selector, hidden_message_id);
@@ -241,9 +241,9 @@ @@ -241,9 +241,9 @@
241 }); 241 });
242 } 242 }
243 243
244 - function invalid_email_validation(value) {  
245 - if( value.trim().length == 0 ) {  
246 - return true; 244 + function invalid_email_validation(value, allow_blank) {
  245 + if( allow_blank && value.trim().length == 0 ) {
  246 + return false;
247 } 247 }
248 248
249 var correct_format_regex = new RegExp(/^\w+@[a-zA-Z_]+?\.[a-zA-Z]{2,3}$/); 249 var correct_format_regex = new RegExp(/^\w+@[a-zA-Z_]+?\.[a-zA-Z]{2,3}$/);
@@ -296,7 +296,7 @@ @@ -296,7 +296,7 @@
296 296
297 addBlurFields("#profile_data_name", "full_name_error", invalid_name_validation); 297 addBlurFields("#profile_data_name", "full_name_error", invalid_name_validation);
298 addBlurFields("#profile_data_email", "email_error", invalid_email_validation); 298 addBlurFields("#profile_data_email", "email_error", invalid_email_validation);
299 - addBlurFields("#user_secondary_email", "email_error", invalid_email_validation); 299 + addBlurFields("#user_secondary_email", "email_error", invalid_email_validation, true);
300 addBlurFields("#profile_data_personal_website", "site_error", invalid_site_validation); 300 addBlurFields("#profile_data_personal_website", "site_error", invalid_site_validation);
301 addBlurFields("#profile_data_organization_website", "site_error", invalid_site_validation); 301 addBlurFields("#profile_data_organization_website", "site_error", invalid_site_validation);
302 }); 302 });