From 2af910e8e61f75903a930541a8eac7e7d780e77f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 12:21:52 +0000
Subject: [PATCH] Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to
 1526 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1532 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb                          | 2 +-
 app/models/repository/cvs.rb                   | 3 ++-
 app/views/layouts/base.rhtml                   | 2 +-
 app/views/repositories/_dir_list_content.rhtml | 2 +-
 app/views/repositories/changes.rhtml           | 3 ++-
 lib/SVG/Graph/Graph.rb                         | 2 +-
 lib/redcloth.rb                                | 2 +-
 public/stylesheets/application.css             | 2 +-
 test/unit/helpers/application_helper_test.rb   | 8 ++++++++
 9 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 1376d349e..a9796240e 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -30,7 +30,7 @@ class Journal < ActiveRecord::Base
                      :project_key => "#{Issue.table_name}.project_id",
                      :date_column => "#{Issue.table_name}.created_on"
   
-  acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
+  acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
                 :author => :user,
                 :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index c2d8be977..78283c60b 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -76,7 +76,8 @@ class Repository::Cvs < Repository
         unless revision_to
           revision_to=scm.get_previous_revision(revision_from)
         end
-        diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
+        file_diff = scm.diff(change_from.path, revision_from, revision_to)
+        diff = diff + file_diff unless file_diff.nil?
       end
     end
     return diff
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 0b9d31512..62d542b7b 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -36,7 +36,7 @@
         <%= render :partial => 'layouts/project_selector' if User.current.memberships.any? %>
     </div>
     
-    <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
+    <h1><%= h(@project && !@project.new_record? ? @project.name : Setting.app_title) %></h1>
     
     <div id="main-menu">
         <%= render_main_menu(@project) %>
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index 3564e52ab..c3bd56e09 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -26,7 +26,7 @@ end %>
 <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
 <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
-<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
+<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
 <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
 </tr>
 <% end %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 2d7462b29..341c6cba5 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -13,6 +13,7 @@
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
 
-<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
+<%= render(:partial => 'revisions', 
+           :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
 
 <% html_title(l(:label_change_plural)) -%>
diff --git a/lib/SVG/Graph/Graph.rb b/lib/SVG/Graph/Graph.rb
index 403a0202b..a5e1ea732 100644
--- a/lib/SVG/Graph/Graph.rb
+++ b/lib/SVG/Graph/Graph.rb
@@ -829,7 +829,7 @@ module SVG
         @doc << DocType.new( %q{svg PUBLIC "-//W3C//DTD SVG 1.0//EN" } +
           %q{"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"} )
         if style_sheet && style_sheet != ''
-          @doc << ProcessingInstruction.new( "xml-stylesheet",
+          @doc << Instruction.new( "xml-stylesheet",
             %Q{href="#{style_sheet}" type="text/css"} )
         end
         @root = @doc.add_element( "svg", {
diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index fb6a053c6..421e5bf01 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1131,7 +1131,7 @@ class RedCloth < String
         end
     end
     
-    ALLOWED_TAGS = %w(redpre pre code)
+    ALLOWED_TAGS = %w(redpre pre code notextile)
     
     def escape_html_tags(text)
       text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fbbe0b2f7..07cd91720 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -223,7 +223,7 @@ height: 1%;
 clear:left;
 }
 
-html>body .tabular p {overflow:auto;}
+html>body .tabular p {overflow:hidden;}
 
 .tabular label{
 font-weight: bold;
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index a1a369cf6..89310326b 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -151,6 +151,14 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal result, textilizable(text) }
   end
   
+  def test_allowed_html_tags
+    to_test = {
+      "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
+      "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+    }
+    to_test.each { |text, result| assert_equal result, textilizable(text) }
+  end
+  
   def test_wiki_links_in_tables
     to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" => 
                  '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +
-- 
2.39.5