jro_apps/redmine Commit - r4833:ca807c8d9284

Fixes wiki diff rendering....

Jean-Philippe Lang -

r4833:ca807c8d9284

parent child

Context file:

r4833:ca807c8d9284

Collapse all files

app/views/wiki/diff.rhtml +1 -1

             <div class="contextual">
             <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
             <h2><%= @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
             <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
             &#8594;
             <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
             <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
             </p>
             <div class="text-diff">
-            <%= @diff.to_html %>
+            <%= simple_format_without_paragraph @diff.to_html %>
             </div>

lib/redmine/helpers/diff.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             module Redmine
               module Helpers
                 class Diff
                   include ERB::Util
                   include ActionView::Helpers::TagHelper
                   include ActionView::Helpers::TextHelper
                   attr_reader :diff, :words
                   def initialize(content_to, content_from)
                     @words = content_to.to_s.split(/(\s+)/)
                     @words = @words.select {|word| word != ' '}
                     words_from = content_from.to_s.split(/(\s+)/)
                     words_from = words_from.select {|word| word != ' '}
                     @diff = words_from.diff @words
                   end
                   def to_html
                     words = self.words.collect{|word| h(word)}
                     words_add = 0
                     words_del = 0
                     dels = 0
                     del_off = 0
                     diff.diffs.each do |diff|
                       add_at = nil
                       add_to = nil
                       del_at = nil
                       deleted = ""
                       diff.each do |change|
                         pos = change[1]
                         if change[0] == "+"
                           add_at = pos + dels unless add_at
                           add_to = pos + dels
                           words_add += 1
                         else
                           del_at = pos unless del_at
                           deleted << ' ' + h(change[2])
                           words_del  += 1
                         end
                       end
                       if add_at
                         words[add_at] = '<span class="diff_in">' + words[add_at]
                         words[add_to] = words[add_to] + '</span>'
                       end
                       if del_at
                         words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
                         dels += 1
                         del_off += words_del
                         words_del = 0
                       end
                     end
-                    simple_format(words.join(' '))
+                    words.join(' ')
                   end
                 end
               end
             end

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