jro_apps/redmine Commit - r12167:4333a80bc1f9

0

app/views/custom_fields/formats/_bool.html.erb +1 0

             <p><%= f.select :default_value, [[]]+@custom_field.possible_values_options %></p>
+            <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>
             <p><%= edit_tag_style_tag f %></p>

0

app/views/custom_fields/formats/_date.html.erb +1 0

             <p><%= f.text_field(:default_value, :size => 10) %></p>
             <%= calendar_for('custom_field_default_value') %>
+            <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>

0

app/views/custom_fields/formats/_list.html.erb +1 0

               <em class="info"><%= l(:text_custom_field_possible_values_info) %></em>
             </p>
             <p><%= f.text_field(:default_value) %></p>
+            <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>
             <p><%= edit_tag_style_tag f %></p>

0

app/views/custom_fields/formats/_numeric.html.erb +1 0

             <%= render :partial => 'custom_fields/formats/regexp', :locals => {:f => f, :custom_field => custom_field} %>
             <p><%= f.text_field(:default_value) %></p>
+            <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>

0

app/views/custom_fields/formats/_string.html.erb +2 -1

             <%= render :partial => 'custom_fields/formats/regexp', :locals => {:f => f, :custom_field => custom_field} %>
-            <p><%= f.check_box :text_formatting, {:label => :setting_text_formatting}, 'full', '' %></p>
+            <p><%= f.check_box :text_formatting, {:label => :setting_text_formatting, :data => {:disables => '#custom_field_url_pattern'}}, 'full', '' %></p>
             <p><%= f.text_field(:default_value) %></p>
+            <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>

0

config/locales/ar.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/az.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/bg.yml +1 0

               description_date_from: Въведете начална дата
               description_date_to: Въведете крайна дата
               text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+              label_link_values_to: Link values to URL

0

config/locales/bs.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/ca.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/cs.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/da.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/de.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/el.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/en-GB.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/en.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL
               button_login: Login
               button_submit: Submit

0

config/locales/es.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/et.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/eu.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/fa.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/fi.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/fr.yml +1 0

               label_only: seulement
               label_drop_down_list: liste déroulante
               label_checkboxes: cases à cocher
+              label_link_values_to: Lier les valeurs vers l'URL
               button_login: Connexion
               button_submit: Soumettre

0

config/locales/gl.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/he.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/hr.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/hu.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/id.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/it.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/ja.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/ko.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/lt.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/lv.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/mk.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/mn.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/nl.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/no.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/pl.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/pt-BR.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/pt.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/ro.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/ru.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sk.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sl.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sq.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sr-YU.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sr.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/sv.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/th.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/tr.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/uk.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/vi.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

config/locales/zh-TW.yml +1 0

               description_date_from: 輸入起始日期
               description_date_to: 輸入結束日期
               text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+              label_link_values_to: Link values to URL

0

config/locales/zh.yml +1 0

               label_only: only
               label_drop_down_list: drop-down list
               label_checkboxes: checkboxes
+              label_link_values_to: Link values to URL

0

lib/redmine/field_format.rb +48 -16

@@ -80,6 +80,8 module Redmine
80	CustomField.store_accessor :format_store, *args	80	CustomField.store_accessor :format_store, *args
81	end	81	end
82		82
		83	field_attributes :url_pattern
		84
83	def name	85	def name
84	self.class.format_name	86	self.class.format_name
85	end	87	end
@@ -144,9 +146,45 module Redmine
144	end	146	end
145		147
146	def formatted_value(view, custom_field, value, customized=nil, html=false)	148	def formatted_value(view, custom_field, value, customized=nil, html=false)
147	cast_value(custom_field, value, customized)	149	casted = cast_value(custom_field, value, customized)
		150	if custom_field.url_pattern.present?
		151	texts_and_urls = Array.wrap(casted).map do \|single_value\|
		152	text = view.format_object(single_value, false).to_s
		153	url = url_from_pattern(custom_field, single_value, customized)
		154	[text, url]
		155	end
		156	links = texts_and_urls.sort_by(&:first).map {\|text, url\| view.link_to text, url}
		157	links.join(', ').html_safe
		158	else
		159	casted
		160	end
148	end	161	end
149		162
		163	# Returns an URL generated with the custom field URL pattern
		164	# and variables substitution:
		165	# %value% => the custom field value
		166	# %id% => id of the customized object
		167	# %project_id% => id of the project of the customized object if defined
		168	# %project_identifier% => identifier of the project of the customized object if defined
		169	# %m1%, %m2%... => capture groups matches of the custom field regexp if defined
		170	def url_from_pattern(custom_field, value, customized)
		171	url = custom_field.url_pattern.to_s.dup
		172	url.gsub!('%value%') {value.to_s}
		173	url.gsub!('%id%') {customized.id.to_s}
		174	url.gsub!('%project_id%') {(customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s}
		175	url.gsub!('%project_identifier%') {(customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s}
		176	if custom_field.regexp.present?
		177	url.gsub!(%r{%m(\d+)%}) do
		178	m = $1.to_i
		179	if matches \|\|= value.to_s.match(Regexp.new(custom_field.regexp))
		180	matches[m].to_s
		181	end
		182	end
		183	end
		184	url
		185	end
		186	protected :url_from_pattern
		187
150	def edit_tag(view, tag_id, tag_name, custom_value, options={})	188	def edit_tag(view, tag_id, tag_name, custom_value, options={})
151	view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id))	189	view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id))
152	end	190	end
@@ -236,8 +274,14 module Redmine
236	field_attributes :text_formatting	274	field_attributes :text_formatting
237		275
238	def formatted_value(view, custom_field, value, customized=nil, html=false)	276	def formatted_value(view, custom_field, value, customized=nil, html=false)
239	if html && custom_field.text_formatting == 'full'	277	if html
240	view.textilizable(value, :object => customized)	278	if custom_field.url_pattern.present?
		279	super
		280	elsif custom_field.text_formatting == 'full'
		281	view.textilizable(value, :object => customized)
		282	else
		283	value.to_s
		284	end
241	else	285	else
242	value.to_s	286	value.to_s
243	end	287	end
@@ -280,23 +324,11 module Redmine
280	add 'link'	324	add 'link'
281	self.searchable_supported = false	325	self.searchable_supported = false
282	self.form_partial = 'custom_fields/formats/link'	326	self.form_partial = 'custom_fields/formats/link'
283	field_attributes :url_pattern
284		327
285	def formatted_value(view, custom_field, value, customized=nil, html=false)	328	def formatted_value(view, custom_field, value, customized=nil, html=false)
286	if html	329	if html
287	if custom_field.url_pattern.present?	330	if custom_field.url_pattern.present?
288	url = custom_field.url_pattern.to_s.dup	331	url = url_from_pattern(custom_field, value, customized)
289	url.gsub!('%value%') {value.to_s}
290	url.gsub!('%id%') {customized.id.to_s}
291	url.gsub!('%project_id%') {(customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s}
292	url.gsub!('%project_identifier%') {(customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s}
293	if custom_field.regexp.present?
294	url.gsub!(%r{%m(\d+)%}) do
295	m = $1.to_i
296	matches \|\|= value.to_s.match(Regexp.new(custom_field.regexp))
297	matches[m].to_s if matches
298	end
299	end
300	else	332	else
301	url = value.to_s	333	url = value.to_s
302	unless url =~ %r{\A[a-z]+://}i	334	unless url =~ %r{\A[a-z]+://}i

0

test/unit/lib/redmine/field_format/list_format_test.rb +21 0

@@ -116,6 +116,27 class Redmine::ListFieldFormatTest < ActionView::TestCase
116	end	116	end
117	end	117	end
118		118
		119	def test_field_with_url_pattern_should_link_value
		120	field = IssueCustomField.new(:field_format => 'list', :url_pattern => 'http://localhost/%value%')
		121	formatted = field.format.formatted_value(self, field, 'foo', Issue.new, true)
		122	assert_equal '<a href="http://localhost/foo">foo</a>', formatted
		123	assert formatted.html_safe?
		124	end
		125
		126	def test_field_with_url_pattern_and_multiple_values_should_link_values
		127	field = IssueCustomField.new(:field_format => 'list', :url_pattern => 'http://localhost/%value%')
		128	formatted = field.format.formatted_value(self, field, ['foo', 'bar'], Issue.new, true)
		129	assert_equal '<a href="http://localhost/bar">bar</a>, <a href="http://localhost/foo">foo</a>', formatted
		130	assert formatted.html_safe?
		131	end
		132
		133	def test_field_with_url_pattern_should_not_link_blank_value
		134	field = IssueCustomField.new(:field_format => 'list', :url_pattern => 'http://localhost/%value%')
		135	formatted = field.format.formatted_value(self, field, '', Issue.new, true)
		136	assert_equal '', formatted
		137	assert formatted.html_safe?
		138	end
		139
119	def test_edit_tag_with_check_box_style_and_multiple_should_select_current_values	140	def test_edit_tag_with_check_box_style_and_multiple_should_select_current_values
120	field = IssueCustomField.new(:field_format => 'list', :possible_values => ['Foo', 'Bar', 'Baz'], :is_required => false,	141	field = IssueCustomField.new(:field_format => 'list', :possible_values => ['Foo', 'Bar', 'Baz'], :is_required => false,
121	:multiple => true, :edit_tag_style => 'check_box')	142	:multiple => true, :edit_tag_style => 'check_box')

	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