Download as
Browse Code »

Commit 4a4ec101f09f05c7fc62fd1bfd32f56b482727bb

Authored by Thiago Ribeiro
2 parents 481d59ae ebfef58a
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_bugs' into 'master' 

Fix bugs

See merge request !9
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
lib/ext/communities_block.rb
  Diff comments   View file @4a4ec10
... ... @@ -22,7 +22,7 @@ class CommunitiesBlock
22 22 valid_communities_string = Community.get_valid_communities_string
23 23 Community.all.each{|community| delete_communities << community.id unless eval(valid_communities_string)}
24 24  
25   - visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities])
  25 + visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities]) unless delete_communities.empty?
26 26  
27 27 if !prioritize_profiles_with_image
28 28 return visible_profiles.all(
... ...
lib/gov_user_plugin.rb
  Diff comments   View file @4a4ec10
... ... @@ -236,12 +236,14 @@ class GovUserPlugin &lt; Noosfero::Plugin
236 236 end
237 237  
238 238 def organization_ratings_plugin_extra_fields_show_data user_rating
  239 + gov_user_self = self
  240 +
239 241 Proc::new {
240 242 if logged_in?
241 243 is_admin = environment.admins.include?(current_user.person)
242 244 is_admin ||= user_rating.organization.admins.include?(current_user.person)
243 245  
244   - if is_admin and context.profile.software?
  246 + if is_admin and gov_user_self.context.profile.software?
245 247 render :file => 'organization_ratings_extra_fields_show_institution',
246 248 :locals => {:user_rating => user_rating}
247 249 end
... ...