# HG changeset patch # User Chris Cannam # Date 1395409069 0 # Node ID a983b92b2fc1b6c4ec99c5f9fd4f522130d5c421 # Parent 0fcf95cec43533c4bdd3aff97168e914e95b56c9# Parent 9f37f7e39d3cfd10e4c8aa498c67066f32ffcd3c Merge from branch cannam diff -r 0fcf95cec435 -r a983b92b2fc1 app/helpers/projects_helper.rb --- a/app/helpers/projects_helper.rb Fri Mar 21 13:14:05 2014 +0000 +++ b/app/helpers/projects_helper.rb Fri Mar 21 13:37:49 2014 +0000 @@ -312,15 +312,21 @@ scores = phash.values.sort threshold = scores[scores.length / 2] if threshold == 0 then threshold = 1 end - uhash = Hash.new - phash.keys.select do |k| + mhash = Hash.new + phash.keys.shuffle.select do |k| if phash[k] < threshold or k.description == "" then false else - uu = k.users - novel = (uhash.keys & uu).empty? - uu.each { |u| uhash[u] = 1 } - novel + u = k.users_by_role + mgrs = [] + u.keys.each do |r| + if r.allowed_to?(:edit_project) + u[r].each { |m| mgrs << m } + end + end + novel = (mhash.keys & mgrs).empty? + mgrs.each { |m| mhash[m] = 1 } + novel and not mgrs.empty? end end.sample(count) end