Download as
Browse Code »

Commit 49506b2f29dca31706785ee2770999ad19950fbb

Authored by Fabio Teixeira
1 parent 3812217d
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: Bug fix and remove unnecessary javascript file 

Signed-off-by: Fabio Teixeira <fabio1079@gmal.com>
Showing 2 changed files with 29 additions and 35 deletions   Show diff stats
public/mpog-user-validations.js
  Diff comments   View file @49506b2
... ... @@ -79,7 +79,7 @@
79 79 jQuery("#password-balloon").html(jQuery("#user_password_menssage").val());
80 80 jQuery("#profile_data_email").parent().append(jQuery("#email_public_message").remove());
81 81  
82   - selectFieldChoices.setSelect();
  82 + if( jQuery("#state_field").length != 0 ) selectFieldChoices.setSelect();
83 83 }
84 84  
85 85 function check_reactivate_account(value, input_object){
... ... @@ -270,35 +270,45 @@
270 270 }
271 271 }
272 272  
  273 + function try_to_remove(list, field) {
  274 + try {
  275 + list.push(field.remove());
  276 + } catch(e) {
  277 + console.log("Cound not remove field");
  278 + }
  279 + }
  280 +
273 281 function get_edit_fields_in_insertion_order() {
274 282 var containers = [];
275 283  
276   - containers.push(get_privacy_selector_parent_div("#profile_data_name").remove());
277   - containers.push(get_privacy_selector_parent_div("#profile_data_email").remove());
278   - containers.push(jQuery("#user_secondary_email").parent().parent().remove());
279   - containers.push(jQuery("#select_institution").remove());
280   - containers.push(get_privacy_selector_parent_div("#profile_data_cell_phone").remove());
281   - containers.push(get_privacy_selector_parent_div("#profile_data_contact_phone").remove());
282   - containers.push(get_privacy_selector_parent_div("#profile_data_comercial_phone").remove());
283   - containers.push(get_privacy_selector_parent_div("#profile_data_personal_website").remove());
284   - containers.push(get_privacy_selector_parent_div("#profile_data_organization_website").remove());
285   - containers.push(get_privacy_selector_parent_div("#profile_data_birth_date").remove());
286   - containers.push(get_privacy_selector_parent_div("#profile_data_country").remove());
287   - containers.push(get_privacy_selector_parent_div("#state_field").remove());
288   - containers.push(get_privacy_selector_parent_div("#city_field").remove());
  284 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_name"));
  285 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_email"));
  286 + try_to_remove(containers, jQuery("#user_secondary_email").parent().parent());
  287 + try_to_remove(containers, jQuery("#select_institution"));
  288 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_cell_phone"));
  289 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_contact_phone"));
  290 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_comercial_phone"));
  291 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_personal_website"));
  292 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_organization_website"));
  293 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_birth_date"));
  294 + try_to_remove(containers, get_privacy_selector_parent_div("#profile_data_country"));
  295 + try_to_remove(containers, get_privacy_selector_parent_div("#state_field"));
  296 + try_to_remove(containers, get_privacy_selector_parent_div("#city_field"));
289 297  
290 298 return containers;
291 299 }
292 300  
293 301 function change_edit_fields_order() {
294 302 var form = jQuery("#profile-data");
295   - var containers = get_edit_fields_in_insertion_order();
  303 + if( form.length != 0 ) {
  304 + var containers = get_edit_fields_in_insertion_order();
296 305  
297   - containers.reverse();
  306 + containers.reverse();
298 307  
299   - containers.forEach(function(container){
300   - form.prepend(container);
301   - });
  308 + containers.forEach(function(container){
  309 + form.prepend(container);
  310 + });
  311 + }
302 312 }
303 313  
304 314 jQuery(document).ready(function(){
... ...
public/mpog_custom_functions.js
View file @3812217
... ... @@ -1,16 +0,0 @@
1   -Array.prototype.removeValue = function(value) {
2   - for (var i = 0; i < this.length; i++) {
3   - if (this[i] === value) {
4   - this.splice(i, 1);
5   - i--;
6   - }
7   - }
8   -
9   - return this;
10   -}
11   -
12   -Array.prototype.removeIndex = function(index) {
13   - this.splice(index, 1);
14   -
15   - return this;
16   -}