Fixed that project is ignored when entering an issue id on /time_entries/new form (#10020).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
41e82c4598
commit
13f28858ba
2 files changed
+20
-4
No files matched your search
@@ -262,12 +262,14 @@ private
|
||||
end
|
||||
|
||||
def find_project
|
||||
if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
|
||||
@project = Project.find(project_id)
|
||||
end
|
||||
if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
|
||||
@issue = Issue.find(issue_id)
|
||||
@project = @issue.project
|
||||
elsif (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
|
||||
@project = Project.find(project_id)
|
||||
else
|
||||
@project ||= @issue.project
|
||||
end
|
||||
if @project.nil?
|
||||
render_404
|
||||
return false
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user