Browse Source

Code cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8826 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/1.4.0
Jean-Philippe Lang 12 years ago
parent
commit
8b3ed4175d
2 changed files with 3 additions and 9 deletions
  1. 2
    8
      app/controllers/context_menus_controller.rb
  2. 1
    1
      app/models/issue.rb

+ 2
- 8
app/controllers/context_menus_controller.rb View File

@@ -4,17 +4,11 @@ class ContextMenusController < ApplicationController

def issues
@issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)

if (@issues.size == 1)
@issue = @issues.first
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
else
@allowed_statuses = @issues.map do |i|
i.new_statuses_allowed_to(User.current)
end.inject do |memo,s|
memo & s
end
end

@allowed_statuses = @issues.map(&:new_statuses_allowed_to).inject{|memo,a| memo & a}
@projects = @issues.collect(&:project).compact.uniq
@project = @projects.first if @projects.size == 1


+ 1
- 1
app/models/issue.rb View File

@@ -510,7 +510,7 @@ class Issue < ActiveRecord::Base
end

# Returns an array of status that user is able to apply
def new_statuses_allowed_to(user, include_default=false)
def new_statuses_allowed_to(user=User.current, include_default=false)
statuses = status.find_new_statuses_allowed_to(
user.admin ? Role.all : user.roles_for_project(project),
tracker,

Loading…
Cancel
Save