Commit 946bc87afa5643d702fa996304c9aee0592fe740

Authored by Gabriela Navarro
Committed by Fabio Teixeira
1 parent 94ed7304
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

Fix institution dialog JS

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
controllers/gov_user_plugin_controller.rb
... ... @@ -67,6 +67,7 @@ class GovUserPluginController &lt; ApplicationController
67 67 response_message = save_institution @institutions
68 68  
69 69 if request.xhr? #User create institution
  70 + puts "-"*80, response_message
70 71 render :json => response_message.to_json
71 72 else #Admin create institution
72 73 session[:notice] = response_message[:message] # consume the notice
... ...
lib/ext/communities_block.rb 0 → 100644
... ... @@ -0,0 +1,49 @@
  1 +require_dependency 'communities_block'
  2 +
  3 +class CommunitiesBlock
  4 +
  5 + def profile_list
  6 + result = get_visible_profiles
  7 +
  8 + list_without_institution = []
  9 +
  10 + result.each do |profile|
  11 + if profile.class == Community && !profile.institution?
  12 + list_without_institution << profile
  13 + end
  14 + end
  15 +
  16 + result = list_without_institution
  17 +
  18 + result.slice(0..get_limit-1)
  19 + end
  20 +
  21 + def profile_count
  22 + profile_list.count
  23 + end
  24 +
  25 + private
  26 +
  27 + def get_visible_profiles
  28 + visible_profiles = profiles.visible.includes(
  29 + [:image,:domains,:preferred_domain,:environment]
  30 + )
  31 + if !prioritize_profiles_with_image
  32 + return visible_profiles.all(
  33 + :limit => get_limit,
  34 + :order => 'profiles.updated_at DESC'
  35 + ).sort_by {rand}
  36 + elsif profiles.visible.with_image.count >= get_limit
  37 + return visible_profiles.with_image.all(
  38 + :limit => get_limit * 5,
  39 + :order => 'profiles.updated_at DESC'
  40 + ).sort_by {rand}
  41 + else
  42 + return visible_profiles.with_image.sort_by {rand} +
  43 + visible_profiles.without_image.all(
  44 + :limit => get_limit * 5, :order => 'profiles.updated_at DESC'
  45 + ).sort_by {rand}
  46 + end
  47 + end
  48 +
  49 +end
... ...
public/views/create-institution.js
... ... @@ -53,7 +53,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
53 53 name : $("#community_name").val(),
54 54 country : $("#community_country").val(),
55 55 state : $("#community_state").val(),
56   - city : $("#community_city").val()
  56 + city : $("#city_field").val()
57 57 }
58 58 }
59 59  
... ... @@ -102,7 +102,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
102 102 errors += "<li>"+response.errors[i]+"</li>";
103 103 }
104 104 errors += "</ul>";
105   - if($('#institution_dialog') != []){
  105 + if($('#institution_dialog') == 0){
106 106 $('#create_institution_errors').switchClass("show-field", "hide-field");
107 107 $('#errorExplanation').html("<h2>"+response.message+"</h2>"+errors);
108 108 }else{
... ...