jro_apps/redmine Commit - r1310:8d4aa6f9ade6

Fixed: single file 'View difference' links do not work because of duplicate slashes in url....

Jean-Philippe Lang -

r1310:8d4aa6f9ade6

parent child

Context file:

r1310:8d4aa6f9ade6

Collapse all files

app/helpers/repositories_helper.rb +5 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'coderay'
             require 'coderay/helpers/file_type'
             require 'iconv'
             module RepositoriesHelper
               def syntax_highlight(name, content)
                 type = CodeRay::FileType[name]
                 type ? CodeRay.scan(content, type).html : h(content)
               end
               def format_revision(txt)
                 txt.to_s[0,8]
               end
               def to_utf8(str)
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
                 @encodings.each do |encoding|
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here and try the next encoding
                   end
                 end
                 str
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
               end
               def scm_select_tag(repository)
                 container = [[]]
                 REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
                 select_tag('repository_scm',
                            options_for_select(container, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
                            )
               end
               def with_leading_slash(path)
-                path ||= ''
+                path.to_s.starts_with?('/') ? path : "/#{path}"
-                path.starts_with?('/') ? path : "/#{path}"
+              end
+              def without_leading_slash(path)
+                path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />(http://, https://, svn://, file:///)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
                                                        :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                                        :onfocus => "this.value=''; this.name='repository[password]';",
                                                        :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def mercurial_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def git_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def cvs_field_tags(form, repository)
                   content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
                   content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
               end
               def bazaar_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
             end

app/views/repositories/revision.rhtml +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag do %>
                 <%= text_field_tag 'rev', @rev, :size => 5 %>
                 <%= submit_tag 'OK' %>
               <% end %>
             </div>
             <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
             <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
             <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.any? %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.each do |issue| %>
               <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </ul>
             <% end %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <div style="float:right;">
             <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
             <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
             <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
             </div>
             <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
             <table class="list">
             <tbody>
             <% @changes.each do |change| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
             <td align="right">
             <% if change.action == "M" %>
-            <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => change.path, :rev => @changeset.revision %>
+            <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.path), :rev => @changeset.revision %>
             <% end %>
             </td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @changes_pages %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages