From 6537c33ca51ee03ed61f6615dd71d8baf34056c5 Mon Sep 17 00:00:00 2001
From: Seiei Miyagi <hanachin@gmail.com>
Date: Thu, 23 Jul 2020 13:56:05 +0900
Subject: [PATCH] Update tooltip title of next / prev issue link

---
 app/controllers/issues_controller.rb | 12 ++++++------
 app/views/issues/_edit.html.erb      |  4 ++--
 app/views/issues/show.html.erb       | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e2cc1505e..24a840013 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -108,7 +108,7 @@ def show
         @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
         @time_entries = @issue.time_entries.visible.preload(:activity, :user)
         @relation = IssueRelation.new
-        retrieve_previous_and_next_issue_ids
+        retrieve_previous_and_next_issue
         render :template => 'issues/show'
       end
       format.api do
@@ -468,10 +468,10 @@ def current_menu_item
 
   private
 
-  def retrieve_previous_and_next_issue_ids
+  def retrieve_previous_and_next_issue
     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)
+      @prev_issue = Issue.find_by(id: params[:prev_issue_id].presence.try(:to_i))
+      @next_issue = Issue.find_by(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)
     else
@@ -485,8 +485,8 @@ def retrieve_previous_and_next_issue_ids
             @issue_position = idx + 1
             @issue_count = issue_ids.size
           end
-          @prev_issue_id = issue_ids[idx - 1] if idx > 0
-          @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
+          @prev_issue = Issue.find_by(id: issue_ids[idx - 1]) if idx > 0
+          @next_issue = Issue.find_by(id: issue_ids[idx + 1]) if idx < (issue_ids.size - 1)
         end
         query_params = @query.as_params
         if @issue_position
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index cc2f110b7..efdea08c3 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -77,8 +77,8 @@
           l(:button_cancel), issue_path(id: @issue.id),
           :onclick => params[:action] == 'show' ? "$('#update').hide(); return false;" : ''
         ) %>
-    <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
-    <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>
+    <%= hidden_field_tag 'prev_issue_id', @prev_issue.id if @prev_issue %>
+    <%= hidden_field_tag 'next_issue_id', @next_issue.id if @next_issue %>
     <%= hidden_field_tag 'issue_position', @issue_position if @issue_position %>
     <%= hidden_field_tag 'issue_count', @issue_count if @issue_count %>
 <% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5dcd833ac..de324b165 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -4,12 +4,12 @@
 <%= issue_status_type_badge(@issue.status) %>
 
 <div class="<%= @issue.css_classes %> details">
-  <% if @prev_issue_id || @next_issue_id %>
+  <% if @prev_issue || @next_issue %>
     <div class="next-prev-links contextual">
-      <%= link_to_if @prev_issue_id,
+      <%= link_to_if @prev_issue,
                      "\xc2\xab #{l(:label_previous)}",
-                     (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
-                     :title => "##{@prev_issue_id}",
+                     (@prev_issue&.id ? issue_path(@prev_issue.id) : nil),
+                     :title => @prev_issue.to_s,
                      :accesskey => accesskey(:previous) %> |
       <% if @issue_position && @issue_count %>
         <span class="position">
@@ -18,10 +18,10 @@
                          @query_path %>
         </span> |
       <% end %>
-      <%= link_to_if @next_issue_id,
+      <%= link_to_if @next_issue,
                      "#{l(:label_next)} \xc2\xbb",
-                     (@next_issue_id ? issue_path(@next_issue_id) : nil),
-                     :title => "##{@next_issue_id}",
+                     (@next_issue&.id ? issue_path(@next_issue.id) : nil),
+                     :title => @next_issue.to_s,
                      :accesskey => accesskey(:next) %>
     </div>
   <% end %>
-- 
2.27.0