diff options
Diffstat (limited to 'app/controllers/issues_controller.rb')
| -rw-r--r-- | app/controllers/issues_controller.rb | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index c5af8658f..a9c3f6183 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -112,8 +112,13 @@ class IssuesController < ApplicationController respond_to do |format| format.html do @priorities = IssuePriority.active - @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) - @time_entries = @issue.time_entries.visible.preload(:activity, :user) + if @project.module_enabled?(:time_tracking) + @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) + @time_entries = @issue.time_entries.visible.preload(:activity, :user) + else + @time_entry = nil + @time_entries = [] + end @relation = IssueRelation.new @has_changesets = @issue.changesets.visible.preload(:repository, :user).exists? retrieve_previous_and_next_issue_ids @@ -224,9 +229,8 @@ class IssuesController < ApplicationController end respond_to do |format| format.html do - redirect_back_or_default( - issue_path(@issue, previous_and_next_issue_ids_params) - ) + redirect_back_or_default issue_path(@issue), + flash: { previous_and_next_issue_ids: previous_and_next_issue_ids_params } end format.api {render_api_ok} end @@ -512,11 +516,14 @@ class IssuesController < ApplicationController end def retrieve_previous_and_next_issue_ids - if params[:prev_issue_id].present? || params[:next_issue_id].present? - @prev_issue_id = params[:prev_issue_id].presence.try(:to_i) - @next_issue_id = params[:next_issue_id].presence.try(:to_i) - @issue_position = params[:issue_position].presence.try(:to_i) - @issue_count = params[:issue_count].presence.try(:to_i) + if flash.key?(:previous_and_next_issue_ids) + flash[:previous_and_next_issue_ids].then do |info| + @prev_issue_id = info[:prev_issue_id].presence.try(:to_i) + @next_issue_id = info[:next_issue_id].presence.try(:to_i) + @issue_position = info[:issue_position].presence.try(:to_i) + @issue_count = info[:issue_count].presence.try(:to_i) + end + flash.delete(:previous_and_next_issue_ids) else retrieve_query_from_session if @query |