Download as
Browse Code »

Commit c25021c16c4c0a05705a17fc7958c9f4ff287621

Authored by Rodrigo Souto
2 parents 76c22144 391b7c0f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'AI3204-bug_person_block' into 'master' 

Ai3204 bug person block

Fixing https://noosfero.org/Development/ActionItem3204

See merge request !262
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/people_block/controllers/people_block_plugin_profile_controller.rb
  Diff comments   View file @c25021c
@@ -4,7 +4,7 @@ class PeopleBlockPluginProfileController < ProfileController @@ -4,7 +4,7 @@ class PeopleBlockPluginProfileController < ProfileController
4 4
5 def members 5 def members
6 if is_cache_expired?(profile.members_cache_key(params)) 6 if is_cache_expired?(profile.members_cache_key(params))
7 - if(params[:role_key]) 7 + unless params[:role_key].blank?
8 role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment) 8 role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
9 @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) 9 @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
10 @members_title = role.name 10 @members_title = role.name
plugins/people_block/test/functional/people_block_plugin_profile_controller_test.rb
  Diff comments   View file @c25021c
@@ -34,7 +34,7 @@ class PeopleBlockPluginProfileControllerTest < ActionController::TestCase @@ -34,7 +34,7 @@ class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
34 attr_accessor :profile, :block, :admin, :member, :moderator 34 attr_accessor :profile, :block, :admin, :member, :moderator
35 35
36 should 'list members without role_key' do 36 should 'list members without role_key' do
37 - get :members, :profile => profile.identifier 37 + get :members, :profile => profile.identifier, :role_key => ""
38 assert_response :success 38 assert_response :success
39 assert_template 'members' 39 assert_template 'members'
40 assert_equivalent [@admin, @member, @moderator], assigns(:members) 40 assert_equivalent [@admin, @member, @moderator], assigns(:members)