jro_apps/redmine Commit - r12574:7b127ee489a1

app/views/custom_fields/select_type.html.erb created 644 +15 0

@@ -0,0 +1,15
	1	<%= title [l(:label_custom_field_plural), custom_fields_path],
	2	l(:label_custom_field_new) %>
	3
	4	<% selected = 0 %>
	5	<%= form_tag new_custom_field_path, :method => 'get' do %>
	6	<div class="box">
	7	<p><%= l(:label_custom_field_select_type) %>:</p>
	8	<p>
	9	<% custom_field_type_options.each do \|name, type\| %>
	10	<label style="display:block;"><%= radio_button_tag 'type', type, 1==selected+=1 %> <%= name %></label>
	11	<% end %>
	12	</p>
	13	</div>
	14	<p><%= submit_tag l(:label_next).html_safe + " »".html_safe, :name => nil %></p>
	15	<% end %>

app/controllers/custom_fields_controller.rb +1 -1

               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

app/helpers/application_helper.rb +6 -2

               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

app/helpers/custom_fields_helper.rb +7 -2

                  :label => DocumentCategory::OptionName}
               ]
-              def custom_fields_tabs
+              def render_custom_fields_tabs(types)
-                CUSTOM_FIELDS_TABS
+                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)

app/views/common/_tabs.html.erb 0 -2

-            <% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
             <div class="tabs">
               <ul>
               <% tabs.each do |tab| -%>

app/views/custom_fields/_index.html.erb 0 -2

               <% 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>

app/views/custom_fields/index.html.erb +9 -1

@@ -1,3 +1,11
		1	<div class="contextual">
		2	<%= link_to l(:label_custom_field_new), new_custom_field_path, :class => 'icon icon-add' %>
		3	</div>
		4
1	<%= title l(:label_custom_field_plural) %>	5	<%= title l(:label_custom_field_plural) %>
2		6
3	<%= render_tabs custom_fields_tabs %>	7	<% if @custom_fields_by_type.present? %>
		8	<%= render_custom_fields_tabs(@custom_fields_by_type.keys) %>
		9	<% else %>
		10	<p class="nodata"><%= l(:label_no_data) %></p>
		11	<% end %>

config/locales/en.yml +1 0

               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

config/locales/fr.yml +1 0

               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

test/functional/custom_fields_controller_test.rb +19 -2

                 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|
                 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
                 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

	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