Commit aa0d93be authored by jplang's avatar jplang

Show tabs for existing custom field types only and adds a view for choosing...

Show tabs for existing custom field types only and adds a view for choosing the type when adding a new custom field.

git-svn-id: https://svn.redmine.org/redmine/trunk@12849 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 33e52380
......@@ -77,7 +77,7 @@ class CustomFieldsController < ApplicationController
def build_new_custom_field
@custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field])
if @custom_field.nil?
render_404
render :action => 'select_type'
end
end
......
......@@ -309,9 +309,13 @@ module ApplicationHelper
end
# Renders tabs and their content
def render_tabs(tabs)
def render_tabs(tabs, selected=params[:tab])
if tabs.any?
render :partial => 'common/tabs', :locals => {:tabs => tabs}
unless tabs.detect {|tab| tab[:name] == selected}
selected = nil
end
selected ||= tabs.first[:name]
render :partial => 'common/tabs', :locals => {:tabs => tabs, :selected_tab => selected}
else
content_tag 'p', l(:label_no_data), :class => "nodata"
end
......
......@@ -40,8 +40,13 @@ module CustomFieldsHelper
:label => DocumentCategory::OptionName}
]
def custom_fields_tabs
CUSTOM_FIELDS_TABS
def render_custom_fields_tabs(types)
tabs = CUSTOM_FIELDS_TABS.select {|h| types.include?(h[:name]) }
render_tabs tabs
end
def custom_field_type_options
CUSTOM_FIELDS_TABS.map {|h| [l(h[:label]), h[:name]]}
end
def render_custom_field_format_partial(form, custom_field)
......
<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
<div class="tabs">
<ul>
<% tabs.each do |tab| -%>
......
......@@ -28,5 +28,3 @@
<% end; reset_cycle %>
</tbody>
</table>
<p><%= link_to l(:label_custom_field_new), new_custom_field_path(:type => tab[:name]), :class => 'icon icon-add' %></p>
<div class="contextual">
<%= link_to l(:label_custom_field_new), new_custom_field_path, :class => 'icon icon-add' %>
</div>
<%= title l(:label_custom_field_plural) %>
<%= render_tabs custom_fields_tabs %>
<% if @custom_fields_by_type.present? %>
<%= render_custom_fields_tabs(@custom_fields_by_type.keys) %>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>
<%= title [l(:label_custom_field_plural), custom_fields_path],
l(:label_custom_field_new) %>
<% selected = 0 %>
<%= form_tag new_custom_field_path, :method => 'get' do %>
<div class="box">
<p><%= l(:label_custom_field_select_type) %>:</p>
<p>
<% custom_field_type_options.each do |name, type| %>
<label style="display:block;"><%= radio_button_tag 'type', type, 1==selected+=1 %> <%= name %></label>
<% end %>
</p>
</div>
<p><%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %></p>
<% end %>
......@@ -910,6 +910,7 @@ en:
label_drop_down_list: drop-down list
label_checkboxes: checkboxes
label_link_values_to: Link values to URL
label_custom_field_select_type: Select the type of object to which the custom field is to be attached
button_login: Login
button_submit: Submit
......
......@@ -886,6 +886,7 @@ fr:
label_drop_down_list: liste déroulante
label_checkboxes: cases à cocher
label_link_values_to: Lier les valeurs vers l'URL
label_custom_field_select_type: Selectionner le type d'objet auquel attacher le champ personnalisé
button_login: Connexion
button_submit: Soumettre
......
......@@ -30,6 +30,14 @@ class CustomFieldsControllerTest < ActionController::TestCase
assert_template 'index'
end
def test_new_without_type_should_render_select_type
get :new
assert_response :success
assert_template 'select_type'
assert_select 'input[name=type]', CustomField.subclasses.size
assert_select 'input[name=type][checked=checked]', 1
end
def test_new_should_work_for_each_customized_class_and_format
custom_field_classes.each do |klass|
Redmine::FieldFormat.available_formats.each do |format_name|
......@@ -113,9 +121,10 @@ class CustomFieldsControllerTest < ActionController::TestCase
assert_equal 'list', field.field_format
end
def test_new_with_invalid_custom_field_class_should_render_404
def test_new_with_invalid_custom_field_class_should_render_select_type
get :new, :type => 'UnknownCustomField'
assert_response 404
assert_response :success
assert_template 'select_type'
end
def test_create_list_custom_field
......@@ -160,6 +169,14 @@ class CustomFieldsControllerTest < ActionController::TestCase
assert_template 'new'
end
def test_create_without_type_should_render_select_type
assert_no_difference 'CustomField.count' do
post :create, :custom_field => {:name => ''}
end
assert_response :success
assert_template 'select_type'
end
def test_edit
get :edit, :id => 1
assert_response :success
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment