Merge pull request #11366 from rubhanazeem/fixes-11353

Add missing parameter for diffs in supersede
openSUSE · Jul 9, 2021 · 03e1f31 · 03e1f31
2 parents 4fadf12 + 566a85e
commit 03e1f31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/api/app/assets/javascripts/webui/request.js b/src/api/app/assets/javascripts/webui/request.js
@@ -137,9 +137,13 @@ function loadDiffs(element){
   var index = element.data('index');
   var url = element.data('url') + '?index=' + index;
   var diffLimit = $('.sourcediff').data('diff-limit');
+  var diffToSuperseded = element.data('diff-to-superseded');
   if(diffLimit){
     url = url + '&full_diff=' + diffLimit;
   }
+  if(diffToSuperseded){
+    url = url + '&diff_to_superseded=' + diffToSuperseded;
+  }
   $.ajax({
     url: url,
     success: function(){

diff --git a/src/api/app/controllers/webui/request_controller.rb b/src/api/app/controllers/webui/request_controller.rb
@@ -100,7 +100,7 @@ def modify_review
 
   def show
     @diff_limit = params[:full_diff] ? 0 : nil
-
+    @diff_to_superseded_id = params[:diff_to_superseded]
     @is_author = @bs_request.creator == User.possibly_nobody.login
 
     @is_target_maintainer = @bs_request.is_target_maintainer?(User.session)
@@ -143,6 +143,7 @@ def request_action
     @action = @actions.find { |action| action[:id] == params['id'].to_i }
     @active = @action[:name]
     @not_full_diff = BsRequest.truncated_diffs?(@actions)
+    @diff_to_superseded_id = params[:diff_to_superseded]
 
     respond_to do |format|
       format.js

diff --git a/src/api/app/views/webui/request/show.html.haml b/src/api/app/views/webui/request/show.html.haml
@@ -31,8 +31,8 @@
       - @actions.each_with_index do |action, index|
         %li.nav-item
           = link_to(action[:name], "##{valid_xml_id(action[:name])}", class: "request-tab nav-link text-nowrap #{'active' if index.zero?}",
-            data: { toggle: 'tab', url: request_action_url(action[:number], action[:id]), tab_pane_id: valid_xml_id(action[:name]), index: index },
-            role: 'tab')
+            data: { toggle: 'tab', url: request_action_url(action[:number], action[:id]), tab_pane_id: valid_xml_id(action[:name]), index: index,
+                    diff_to_superseded: @diff_to_superseded_id }, role: 'tab')
   .card-body
     .d-flex.justify-content-center.loading-diff
       .spinner-border{ role: 'status' }