Commit 36c3a2b2 authored by jplang's avatar jplang

Fill the issue id when logging time from the time log list of an issue (#26520).

git-svn-id: https://svn.redmine.org/redmine/trunk@16924 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 303b84f9
......@@ -113,6 +113,13 @@ class TimeEntryQuery < Query
[['spent_on', 'desc']]
end
# If a filter against a single issue is set, returns its id, otherwise nil.
def filtered_issue_id
if value_for('issue_id').to_s =~ /\A(\d+)\z/
$1
end
end
def base_scope
TimeEntry.visible.
joins(:project, :user).
......
<div class="contextual">
<%= link_to l(:button_log_time),
_new_time_entry_path(@project, @issue),
_new_time_entry_path(@project, @query.filtered_issue_id),
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
</div>
......
......@@ -771,6 +771,9 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_select '.total-for-hours', :text => 'Hours: 162.90'
assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
# 'Log time' shoudl link to log time on the filtered issue
assert_select 'a[href=?]', "/projects/ecookbook/time_entries/new"
end
def test_index_with_display_subprojects_issues_to_false_should_not_include_subproject_entries
......@@ -805,6 +808,9 @@ class TimelogControllerTest < Redmine::ControllerTest
get :index, :params => {:project_id => 'ecookbook', :issue_id => issue.id.to_s, :set_filter => 1}
assert_select '.total-for-hours', :text => 'Hours: 7.00'
# 'Log time' shoudl link to log time on the filtered issue
assert_select 'a[href=?]', "/issues/#{issue.id}/time_entries/new"
end
def test_index_at_project_level_with_issue_fixed_version_id_short_filter
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment