jro_apps/redmine Commit - r905:99f9aea80a2b

* Referencing issues in commit messages: enter * in 'Referencing keywords' to link any issue id without using keywords....

Jean-Philippe Lang -

r905:99f9aea80a2b

parent child

Context file:

r905:99f9aea80a2b

Collapse all files

test/unit/changeset_test.rb created 644 +42 0

@@ -0,0 +1,42
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class ChangesetTest < Test::Unit::TestCase
	21	fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :trackers
	22
	23	def setup
	24	end
	25
	26	def test_ref_keywords_any
	27	Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
	28	Setting.commit_fix_done_ratio = '90'
	29	Setting.commit_ref_keywords = '*'
	30	Setting.commit_fix_keywords = 'fixes , closes'
	31
	32	c = Changeset.new(:repository => Project.find(1).repository,
	33	:committed_on => Time.now,
	34	:comments => 'New commit (#2). Fixes #1')
	35	c.scan_comment_for_issue_ids
	36
	37	assert_equal [1, 2], c.issue_ids.sort
	38	fixed = Issue.find(1)
	39	assert fixed.closed?
	40	assert_equal 90, fixed.done_ratio
	41	end
	42	end

app/helpers/application_helper.rb +1 -1

                 # example:
                 #   #52 -> <a href="/issues/show/52">#52</a>
                 #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (project.id is 6)
-                text = text.gsub(%r{([\s,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
+                text = text.gsub(%r{([\s\(,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
                   leading, otype, oid = $1, $2, $3
                   link = nil
                   if otype == 'r'

app/models/changeset.rb +9 0

                 return if kw_regexp.blank?
                 referenced_issues = []
+                if ref_keywords.delete('*')
+                  # find any issue ID in the comments
+                  target_issue_ids = []
+                  comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+                  referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
+                end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   end
                   referenced_issues += target_issues
                 end
                 self.issues = referenced_issues.uniq
               end
             end

lang/pl.yml +7 -7

             label_attachment_plural: Pliki
             label_report: Raport
             label_report_plural: Raporty
-            label_news: Nowość
+            label_news: Wiadomość
-            label_news_new: Dodaj nowość
+            label_news_new: Dodaj wiadomość
-            label_news_plural: Nowości
+            label_news_plural: Wiadomości
-            label_news_latest: Ostatnie nowości
+            label_news_latest: Ostatnie wiadomości
-            label_news_view_all: Pokaż wszystkie nowości
+            label_news_view_all: Pokaż wszystkie wiadomości
             label_change_log: Lista zmian
             label_settings: Ustawienia
             label_overview: Przegląd
             label_latest_revision_plural: Ostatnie zmiany
             label_view_revisions: Pokaż zmiany
             label_max_size: Maksymalny rozmiar
-            label_on: 'włączone'
+            label_on: 'z'
             label_sort_highest: Przesuń na górę
             label_sort_higher: Do góry
             label_sort_lower: Do dołu
             label_registration_automatic_activation: automatyczna aktywacja kont
             label_registration_manual_activation: manualna aktywacja kont
             notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
-            field_time_zone: Time zone
+            field_time_zone: Strefa czasowa

test/unit/repository_test.rb +1 -1

                 COMMENT
                 changeset = Changeset.new(
                   :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
-                  :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository_id => repository )
+                  :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository => repository )
                 assert( changeset.save )
                 assert_not_equal( comment, changeset.comments )
                 assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )

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