Defect #32449
closed
Diff view for .js files in repositories is broken
Added by terrell smith over 4 years ago.
Updated about 4 years ago.
Description
When viewing a commit in the repository for a non-javascript file, clicking the diff link for that file opens the diff in the "view differences" tab on the same page.
When viewing a javascript file with a .js extension, clicking the diff link opens the snippet that would normally go in the "view differences" as a new page with no styling.
This is happening on our install across projects and consistently for all javascript files. Clicking on the "view differences" table for the javascript files instead of the diff link does display normally. It is easy to work around, by just using the show differences tab instead of the diff link.
Environment:
Redmine version 4.0.5.stable
Ruby version 2.6.3-p62 (2019-04-16) [x86_64-linux]
Rails version 5.2.3
Environment production
Database adapter Mysql2
Mailer queue ActiveJob::QueueAdapters::AsyncAdapter
Mailer delivery smtp
SCM:
Git 2.17.1
Files
- Status changed from New to Confirmed
Same with our Mercurial SCM.
version 3.4.4.stable --> works fine¶
version 4.0.4.stable --> no styles and the menu disappears¶
When displaying the js file, base.html.erb was not used as the layout file.
Specifying an explicit layout file as shown below should solve the problem.
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 269bc70a0..8350b4d48 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -269,7 +269,7 @@ class RepositoriesController < ApplicationController
@changeset = @repository.find_changeset_by_name(@rev)
@changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
@diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
- render :diff, :formats => :html
+ render :diff, :formats => :html, :layout => 'base.html.erb'
end
end
- Related to Defect #30850: Unified diff link broken on specific file/revision diff view added
After applying Mizuki ISHIKAWA's change and restarting Redmine, View differences page works flawlessly with .js files.
- Target version set to 4.0.7
Setting the target version to 4.0.7.
- Subject changed from diff display issue for js files in git to Diff view for .js files in repositories is broken
- Status changed from Confirmed to Closed
- Assignee set to Go MAEDA
- Resolution set to Fixed
Committed the patch. Thank you all for reporting and fixing this issue.
- Related to Defect #37626: Diff of a javascript file in repository module is not displayed with layout added
Also available in: Atom
PDF
Updated by 
Updated by 
Updated by 
Updated by