Defect #6242

can't switch between inline and side-by-side diff

Added by Jean-Claude Wippler about 7 years ago. Updated about 7 years ago.

Status:ClosedStart date:2010-08-28
Priority:NormalDue date:
Assignee:Jean-Baptiste Barth% Done:

100%

Category:UI
Target version:1.0.2
Resolution:Fixed Affected version:1.0.1

Description

I upgraded from 0,.8.4 to 1.0.1 recently. When switching between inline and s-b-s mode, I get an error, such as:

The requested URL /projects/jeenode/repository/diff/Ports/examples/powerdown_demo/powerdown_demo.pde was not found on this server.

The problem is caused by /'s being URL-escaped to %2F - when I manually change them back, the URL works as intended. Here's the URL to which Redmine wants to redirect when switching diff mode in the popup:

http://[...]/projects/jeenode/repository/diff/Ports%2Fexamples%2Fpowerdown_demo%2Fpowerdown_demo.pde?rev=5969&type=inline

(I've edited out the actual server name because it's in a temp location and on a very slow link + machine)

Associated revisions

Revision 4100
Added by Jean-Baptiste Barth about 7 years ago

Fixes switching between inline and side-by-side in diff view with path. #6242

Contributed by Felix Schäfer

History

#1 Updated by Michael Tenschert about 7 years ago

Yes, I also get this error on Centos 5.5.

#2 Updated by Jean-Claude Wippler about 7 years ago

same as #6292

#3 Updated by Theo Silelidis about 7 years ago

is it maybe something to do with the escaping for #5548 ?

#4 Updated by Jean-Baptiste Barth about 7 years ago

  • Category set to SCM

Same as #6292, we cannot help you until you read SubmittingBugs and provide requested information. Moreover, I'd like to have minimal steps to reproduce, which SCM do you use, in which version, which OS, etc.

#5 Updated by Jean-Claude Wippler about 7 years ago

About your application's environment
Ruby version              1.8.6 (i486-linux)
RubyGems version          1.3.5
Rack version              1.0
Rails version             2.3.5
Active Record version     2.3.5
Active Resource version   2.3.5
Action Mailer version     2.3.5
Active Support version    2.3.5
Edge Rails revision       unknown
Application root          /var/www/railsapp
Environment               development
Database adapter          mysql
Database schema version   0

About your Redmine plugins
Markdown formatter   0.0.1

I'm using subversion. To reproduce, here's what I did: took the Redmine turnkey install from http://www.turnkeylinux.org/redmine - then upgraded it as described.

#6 Updated by Rémi Faitout about 7 years ago

I'm having the same problem with latest Bitnami Redmine stack on a Windows 2003 Server standard edition. I have also recently migrated from 0.9.4 to 1.0.1 using the Bitnami upgrade documentation, and I use a Subversion repository. Here are the versions in Bitnami stack :

  - Redmine 1.0.1
  - Apache 2.2.14
  - ImageMagick 6.5.6-8-Q8
  - MySQL 5.0.83
  - Subversion 1.6.6
  - Ruby 1.8.7-p249-i386-mingw32
  - Rails 2.3.5
  - RubyGems 1.3.6

The error occurs only when switching between inline and sbs on a single file diff (with the "view differences" combo on top); it's perfectly working when you display the diff of a whole revision. As described on top, the part of the url describing the path in the SCM repository contains %2F instead of /

#7 Updated by Sascha Drews about 7 years ago

Same problem for me.

Showing the diff for a file shows automatically sbs-view. Everything works fine.

https://servername/projects/myproject/repository/revisions/1084/diff/trunk/lib/model/messages/Incoming.php

Switching to inline view (using the dropdown) gives a 404.

https://servername/projects/myproject/repository/diff/trunk%2Flib%2Fmodel%2Fmessages%2FIncoming.php?rev=1084&type=inline

My configuration:

Ruby version              1.8.7 (x86_64-linux)
RubyGems version          1.3.6
Rack version              1.0
Rails version             2.3.5
Active Record version     2.3.5
Active Resource version   2.3.5
Action Mailer version     2.3.5
Active Support version    2.3.5
Edge Rails revision       unknown
Application root          /srv/rails/redmine-1.0.1
Environment               production
Database adapter          mysql
Database schema version   20100819172912

#8 Updated by Djordjije Crni about 7 years ago

The same problem for me...

Inline view, shown by default, works fine. Switching to sbs view gives 404 error.

Ruby version              1.8.7 (i686-linux)
RubyGems version          1.3.7
Rack version              1.0
Rails version             2.3.5
Active Record version     2.3.5
Active Resource version   2.3.5
Action Mailer version     2.3.5
Active Support version    2.3.5
Edge Rails revision       unknown
Application root          /opt/rails/redmine-1.0.1
Environment               production
Database adapter          mysql
Database schema version   20100819172912

svn, version 1.6.12 (r955767)

#9 Updated by Mischa The Evil about 7 years ago

It seems I'm able to reproduce this behaviour. I'll look into it tomorrow extensively.

Note: besides that nobody else here actually posted a stacktrace, it seems that nothing about the error is written to the Rails log :S

#10 Updated by Jean-Claude Wippler about 7 years ago

Mischa The Evil wrote:

Note: besides that nobody else here actually posted a stacktrace, it seems that nothing about the error is written to the Rails log :S

It's not a Ruby exception. It's an incorrect URL.

#11 Updated by Felix Schäfer about 7 years ago

  • Category changed from SCM to UI
  • Status changed from New to 7
  • Assignee set to Jean-Baptiste Barth
  • Target version set to 1.0.2

It is an incorrect URL indeed, fixed in http://github.com/thegcat/redmine/commit/0392b9f2b4847218982d948f5eb1beee21f1b1ba

@JB: if you'd be so kind :-)

#12 Updated by Jean-Baptiste Barth about 7 years ago

  • Status changed from 7 to Resolved
  • % Done changed from 0 to 100
  • Resolution set to Fixed

Thanks! Committed in r4100

#13 Updated by Jean-Claude Wippler about 7 years ago

Fix confirmed. Thank you Felix! :)

#14 Updated by Eric Davis about 7 years ago

  • Status changed from Resolved to Closed

Merged into 1.0-stable for release in 1.0.2

Also available in: Atom PDF