jro_apps/redmine Commit - r13133:f33dfe92436e

Code cleanup....

Jean-Philippe Lang -

r13133:f33dfe92436e

parent child

Context file:

r13133:f33dfe92436e

Collapse all files

app/models/issue.rb +15 -10

                   initial_status = nil
                   if new_record?
                     initial_status = IssueStatus.default
-                  elsif status_id_was
+                  else
-                    initial_status = IssueStatus.find_by_id(status_id_was)
+                    initial_status = status_was
                   end
-                  initial_status ||= status
                   initial_assigned_to_id = assigned_to_id_changed? ? assigned_to_id_was : assigned_to_id
                   assignee_transitions_allowed = initial_assigned_to_id.present? &&
                     (user.id == initial_assigned_to_id || user.group_ids.include?(initial_assigned_to_id))
-                  statuses = initial_status.find_new_statuses_allowed_to(
+                  statuses = []
-                    user.admin ? Role.all : user.roles_for_project(project),
+                  if initial_status
-                    tracker,
+                    statuses += initial_status.find_new_statuses_allowed_to(
-                    author == user,
+                      user.admin ? Role.all.to_a : user.roles_for_project(project),
-                    assignee_transitions_allowed
+                      tracker,
+                      author == user,
+                      assignee_transitions_allowed
+                      )
+                  end
                   statuses << initial_status unless statuses.empty?
                   statuses << IssueStatus.default if include_default
                   statuses = statuses.compact.uniq.sort
-                  blocked? ? statuses.reject {|s| s.is_closed?} : statuses
+                  if blocked?
+                    statuses.reject!(&:is_closed?)
+                  end
+                  statuses
                 end
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages