Download as
Browse Code »

Commit fe47b515599e428819d04d961a1540bda376ce23

Authored by Rodrigo Souto
1 parent 145f4745
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

[work-assignment] Setting user on work_assignment cache_key

Showing 2 changed files with 17 additions and 0 deletions   Show diff stats
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
  Diff comments   View file @fe47b51
... ... @@ -40,4 +40,9 @@ class WorkAssignmentPlugin::WorkAssignment < Folder
40 40 children.map(&:children).flatten.compact
41 41 end
42 42  
  43 + def cache_key_with_person(params = {}, user = nil, language = 'en')
  44 + cache_key_without_person + (user && profile.members.include?(user) ? "-#{user.identifier}" : '')
  45 + end
  46 + alias_method_chain :cache_key, :person
  47 +
43 48 end
... ...
plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
  Diff comments   View file @fe47b51
... ... @@ -40,4 +40,16 @@ class WorkAssignmentTest < ActiveSupport::TestCase
40 40 author_folder = work_assignment.find_or_create_author_folder(author)
41 41 assert author_folder, submission.parent
42 42 end
  43 +
  44 + should 'add logged user on cache_key if is a member' do
  45 + organization = fast_create(Organization)
  46 + not_member = fast_create(Person)
  47 + member = fast_create(Person)
  48 + organization.add_member(member)
  49 + work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Sample Work Assignment', :profile => organization)
  50 +
  51 + assert_no_match(/-#{not_member.identifier}/, work_assignment.cache_key({}, not_member))
  52 + assert_match(/-#{member.identifier}/, work_assignment.cache_key({}, member))
  53 + end
  54 +
43 55 end
... ...