Merge commit 'origin/master'
This commit is contained in:
@@ -23,10 +23,14 @@ module RateUsersHelperPatch
|
||||
options = content_tag('option', "--- #{l(:rate_label_default)} ---", :value => '')
|
||||
projects_by_root = projects.group_by(&:root)
|
||||
projects_by_root.keys.sort.each do |root|
|
||||
options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)), :selected => root == selected)
|
||||
root_selected = (root == selected) ? 'selected' : nil
|
||||
|
||||
options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)), :selected => root_selected)
|
||||
projects_by_root[root].sort.each do |project|
|
||||
next if project == root
|
||||
options << content_tag('option', '» ' + h(project.name), :value => project.id, :selected => project == selected)
|
||||
child_selected = (project == selected) ? 'selected' : nil
|
||||
|
||||
options << content_tag('option', '» ' + h(project.name), :value => project.id, :selected => child_selected)
|
||||
end
|
||||
end
|
||||
options
|
||||
|
||||
Reference in New Issue
Block a user