diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-22 14:09:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-22 14:09:33 +0000 |
| commit | 4333a80bc1f9680782bdb468fceff98d30b1e32a (patch) | |
| tree | 1aecd770ccbb320db89ca771b990e29d54319969 /app/views/custom_fields | |
| parent | b8b358a85fdab392f707b5da73da151728cd8441 (diff) | |
| download | redmine-4333a80bc1f9680782bdb468fceff98d30b1e32a.tar.gz redmine-4333a80bc1f9680782bdb468fceff98d30b1e32a.zip | |
Adds support for links on values for various custom field formats (#1358).
git-svn-id: http://svn.redmine.org/redmine/trunk@12442 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/custom_fields')
| -rw-r--r-- | app/views/custom_fields/formats/_bool.html.erb | 1 | ||||
| -rw-r--r-- | app/views/custom_fields/formats/_date.html.erb | 1 | ||||
| -rw-r--r-- | app/views/custom_fields/formats/_list.html.erb | 1 | ||||
| -rw-r--r-- | app/views/custom_fields/formats/_numeric.html.erb | 1 | ||||
| -rw-r--r-- | app/views/custom_fields/formats/_string.html.erb | 3 |
5 files changed, 6 insertions, 1 deletions
diff --git a/app/views/custom_fields/formats/_bool.html.erb b/app/views/custom_fields/formats/_bool.html.erb index 25c464fb9..81aa64afe 100644 --- a/app/views/custom_fields/formats/_bool.html.erb +++ b/app/views/custom_fields/formats/_bool.html.erb @@ -1,2 +1,3 @@ <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> diff --git a/app/views/custom_fields/formats/_date.html.erb b/app/views/custom_fields/formats/_date.html.erb index 807a9269e..df3ba0789 100644 --- a/app/views/custom_fields/formats/_date.html.erb +++ b/app/views/custom_fields/formats/_date.html.erb @@ -1,2 +1,3 @@ <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> diff --git a/app/views/custom_fields/formats/_list.html.erb b/app/views/custom_fields/formats/_list.html.erb index 9bbd6a243..675bbbf8d 100644 --- a/app/views/custom_fields/formats/_list.html.erb +++ b/app/views/custom_fields/formats/_list.html.erb @@ -3,4 +3,5 @@ <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> diff --git a/app/views/custom_fields/formats/_numeric.html.erb b/app/views/custom_fields/formats/_numeric.html.erb index 06187485d..cc0c798a6 100644 --- a/app/views/custom_fields/formats/_numeric.html.erb +++ b/app/views/custom_fields/formats/_numeric.html.erb @@ -1,2 +1,3 @@ <%= 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> diff --git a/app/views/custom_fields/formats/_string.html.erb b/app/views/custom_fields/formats/_string.html.erb index 0c71243a8..08aac8eb2 100644 --- a/app/views/custom_fields/formats/_string.html.erb +++ b/app/views/custom_fields/formats/_string.html.erb @@ -1,3 +1,4 @@ <%= 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> |