jro_apps/redmine Commit - r2589:7b699af83748

Merged r2664, r2665, r2670, r2674, r2677, r2679 from trunk....

Jean-Philippe Lang -

r2589:7b699af83748

parent child

Context file:

r2589:7b699af83748

Collapse all files

app/models/attachment.rb +9 -10

                 nil
               end
-              # Copy temp file to its final location
+              # Copies the temporary file to its final location
+              # and computes its MD5 hash
               def before_save
                 if @temp_file && (@temp_file.size > 0)
                   logger.debug("saving '#{self.diskfile}'")
+                  md5 = Digest::MD5.new
                   File.open(diskfile, "wb") do |f|
-                    f.write(@temp_file.read)
+                    buffer = ""
+                    while (buffer = @temp_file.read(8192))
+                      f.write(buffer)
+                      md5.update(buffer)
+                    end
                   end
-                  self.digest = self.class.digest(diskfile)
+                  self.digest = md5.hexdigest
                 end
                 # Don't save the content type if it's longer than the authorized length
                 if self.content_type && self.content_type.length > 255
                 end
                 df
               end
-              # Returns the MD5 digest of the file at given path
-              def self.digest(filename)
-                File.open(filename, 'rb') do |f|
-                  Digest::MD5.hexdigest(f.read)
-                end
-              end
             end

app/views/projects/settings.rhtml +5 0

             <h2><%=l(:label_settings)%></h2>
             <% tabs = project_settings_tabs %>
+            <% if tabs.any? %>
             <% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
             <div class="tabs">
                                    :style => (tab[:name] != selected_tab ? 'display:none' : nil),
                                    :class => 'tab-content') %>
             <% end -%>
+            <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+            <% end %>
             <% html_title(l(:label_settings)) -%>

doc/CHANGELOG +9 0

@@ -5,6 +5,15 Copyright (C) 2006-2009 Jean-Philippe Lang
5	http://www.redmine.org/	5	http://www.redmine.org/
6		6
7		7
		8	== 2009-xx-xx v0.8.4
		9
		10	* Allow textile mailto links
		11	* Fixed: memory consumption when uploading file
		12	* Fixed: Mercurial integration doesn't work if Redmine is installed in folder path containing space
		13	* Fixed: an error is raised when no tab is available on project settings
		14	* Fixed: insert image macro corrupts urls with excalamation marks
		15
		16
8	== 2009-04-05 v0.8.3	17	== 2009-04-05 v0.8.3
9		18
10	* Separate project field and subject in cross-project issue view	19	* Separate project field and subject in cross-project issue view

lib/redcloth3.rb +2 -2

                         (?:\(([^)]+?)\)(?="))?     # $title
                         ":
                         (                          # $url
-                        (\/|[a-zA-Z]+:\/\/|www\.)  # $proto
+                        (\/|[a-zA-Z]+:\/\/|www\.|mailto:)  # $proto
                         [\w\/]\S+?
                         )
                         (\/)?                      # $slash
                 end
                 IMAGE_RE = /
-                        (<p>|.|^)            # start of line?
+                        (<p>|\s|^)           # start of line?
                         \!                   # opening
                         (\<|\=|\>)?          # optional alignment atts
                         (#{C})               # optional style,class atts

lib/redmine/scm/adapters/mercurial_adapter.rb +1 -1

                     # makes Mercurial produce a xml output.
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revisions = Revisions.new
-                      cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.class.template_path}"
+                      cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
                       if identifier_from && identifier_to
                         cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
                       elsif identifier_from

test/unit/attachment_test.rb +13 -4

@@ -22,6 +22,19 class AttachmentTest < Test::Unit::TestCase
22		22
23	def setup	23	def setup
24	end	24	end
		25
		26	def test_create
		27	a = Attachment.new(:container => Issue.find(1),
		28	:file => test_uploaded_file("testfile.txt", "text/plain"),
		29	:author => User.find(1))
		30	assert a.save
		31	assert_equal 'testfile.txt', a.filename
		32	assert_equal 59, a.filesize
		33	assert_equal 'text/plain', a.content_type
		34	assert_equal 0, a.downloads
		35	assert_equal Digest::MD5.hexdigest(test_uploaded_file("testfile.txt", "text/plain").read), a.digest
		36	assert File.exist?(a.diskfile)
		37	end
25		38
26	def test_diskfilename	39	def test_diskfilename
27	assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/	40	assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
@@ -30,8 +43,4 class AttachmentTest < Test::Unit::TestCase
30	assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]	43	assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
31	assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]	44	assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
32	end	45	end
33
34	def test_digest
35	assert_equal '1478adae0d4eb06d35897518540e25d6', Attachment.digest(Test::Unit::TestCase.fixture_path + "/files/testfile.txt")
36	end
37	end	46	end

test/unit/helpers/application_helper_test.rb +7 -1

                   'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
                   'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>',
                   'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
+                  # two exclamation marks
+                  'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
                   '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
                   "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
                   # no multiline link text
-                  "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
+                  "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test",
+                  # mailto link
+                  "\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",
+                  # two exclamation marks
+                  '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               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