[Git][noosfero/noosfero][master] 2 commits: Fix work assignments plugin pagination cache

[Tallys Martins]

Tallys Martins pushed to branch master at Noosfero / noosfero


Commits:
a2ee0cdf by pedrodelyra at 2017-04-19T15:05:33-03:00
Fix work assignments plugin pagination cache

Signed-off-by: mendesiasmin <mendesiasmin96 at gmail.com>
Signed-off-by: pedrodelyra <pedrodelyra at gmail.com>

- - - - -
c3ecf2a2 by Tallys Martins at 2017-04-19T18:39:02+00:00
Merge branch 'fix-work-assignment-pagination-cache' into 'master'

Fix work assignments plugin pagination cache

See merge request !1166
- - - - -


2 changed files:

- plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
- plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb


Changes:

=====================================
plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
=====================================
--- a/plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
+++ b/plugins/work_assignment/lib/work_assignment_plugin/work_assignment.rb
@@ -54,9 +54,4 @@ class WorkAssignmentPlugin::WorkAssignment < Folder
   def submissions
     children.map(&:children).flatten.compact
   end
-
-  def cache_key_with_person(params = {}, user = nil, language = 'en')
-    cache_key_without_person + (user && profile.members.include?(user) ? "-#{user.identifier}" : '')
-  end
-  alias_method_chain :cache_key, :person
 end


=====================================
plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
=====================================
--- a/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
+++ b/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
@@ -41,15 +41,4 @@ class WorkAssignmentTest < ActiveSupport::TestCase
     assert_equal author_folder, submission.parent
   end
 
-  should 'add logged user on cache_key if is a member' do
-    organization = fast_create(Organization)
-    not_member = fast_create(Person)
-    member = fast_create(Person)
-    organization.add_member(member)
-    work_assignment = WorkAssignmentPlugin::WorkAssignment.create!(:name => 'Sample Work Assignment', :profile => organization)
-
-    assert_no_match(/-#{not_member.identifier}/, work_assignment.cache_key({}, not_member))
-    assert_match(/-#{member.identifier}/, work_assignment.cache_key({}, member))
-  end
-
 end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ba4490fdf9caff4ab728bae38015553ac9cb8b64...c3ecf2a2d1e32448c0796602eafba574aa092fa9

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ba4490fdf9caff4ab728bae38015553ac9cb8b64...c3ecf2a2d1e32448c0796602eafba574aa092fa9
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170419/b4d0b1b2/attachment-0001.html>