jro_apps/redmine Commit - r9980:599736aca7b9

Update the new custom field form with remotely....

Jean-Philippe Lang -

r9980:599736aca7b9

parent child

Context file:

r9980:599736aca7b9

Collapse all files

app/views/custom_fields/new.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	$('#content').html('<%= escape_javascript(render :template => 'custom_fields/new', :layout => nil, :formats => [:html]) %>')

app/models/custom_field.rb +4 0

                 validate_field_value(value).empty?
               end
+              def format_in?(*args)
+                args.include?(field_format)
+              end
               protected
               # Returns the error message for the given value regarding its format

app/views/custom_fields/_form.html.erb +14 -72

@@ -1,88 +1,31
1	<%= error_messages_for 'custom_field' %>	1	<%= error_messages_for 'custom_field' %>
2		2
3	<script type="text/javascript">
4	//<![CDATA[
5	function toggle_custom_field_format() {
6	var format = $("#custom_field_field_format").val();
7	var p_length = $("#custom_field_min_length");
8	var p_regexp = $("#custom_field_regexp");
9	var p_values = $("#custom_field_possible_values");
10	var p_searchable = $("#custom_field_searchable");
11	var p_default = $("#custom_field_default_value");
12	var p_multiple = $("#custom_field_multiple");
13	// can't change type on JQuery objects
14	var p_default2 = document.getElementById("custom_field_default_value");
15
16	p_default2.type = 'text';
17	p_default.parent().show();
18
19	switch (format) {
20	case "list":
21	p_length.parent().hide();
22	p_regexp.parent().hide();
23	p_searchable.parent().show();
24	p_values.parent().show();
25	p_multiple.parent().show();
26	break;
27	case "bool":
28	p_default2.type = 'checkbox';
29	p_length.parent().hide();
30	p_regexp.parent().hide();
31	p_searchable.parent().hide();
32	p_values.parent().hide();
33	p_multiple.parent().hide();
34	break;
35	case "date":
36	p_length.parent().hide();
37	p_regexp.parent().hide();
38	p_searchable.parent().hide();
39	p_values.parent().hide();
40	p_multiple.parent().hide();
41	break;
42	case "float":
43	case "int":
44	p_length.parent().show();
45	p_regexp.parent().show();
46	p_searchable.parent().hide();
47	p_values.parent().hide();
48	p_multiple.parent().hide();
49	break;
50	case "user":
51	case "version":
52	p_length.parent().hide();
53	p_regexp.parent().hide();
54	p_searchable.parent().hide();
55	p_values.parent().hide();
56	p_multiple.parent().show();
57	p_default.parent().hide();
58	break;
59	default:
60	p_length.parent().show();
61	p_regexp.parent().show();
62	p_searchable.parent().show();
63	p_values.parent().hide();
64	p_multiple.parent().hide();
65	break;
66	}
67	}
68
69	//]]>
70	</script>
71
72	<div class="box tabular">	3	<div class="box tabular">
73	<p><%= f.text_field :name, :required => true %></p>	4	<p><%= f.text_field :name, :required => true %></p>
74	<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :~~onchange => "toggle_~~custom_field~~_format();",~~	5	<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
75	:disabled => !@custom_field.new_record? %></p>	6
		7	<% if @custom_field.format_in? 'list', 'user', 'version' %>
76	<p><%= f.check_box :multiple, :disabled => @custom_field.multiple && !@custom_field.new_record? %></p>	8	<p><%= f.check_box :multiple, :disabled => @custom_field.multiple && !@custom_field.new_record? %></p>
		9	<% end %>
		10
		11	<% unless @custom_field.format_in? 'list', 'bool', 'date', 'user', 'version' %>
77	<p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>	12	<p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
78	<%= f.text_field :min_length, :size => 5, :no_label => true %> -	13	<%= f.text_field :min_length, :size => 5, :no_label => true %> -
79	<%= f.text_field :max_length, :size => 5, :no_label => true %><br />(<%=l(:text_min_max_length_info)%>)</p>	14	<%= f.text_field :max_length, :size => 5, :no_label => true %><br />(<%=l(:text_min_max_length_info)%>)</p>
80	<p><%= f.text_field :regexp, :size => 50 %><br />(<%=l(:text_regexp_info)%>)</p>	15	<p><%= f.text_field :regexp, :size => 50 %><br />(<%=l(:text_regexp_info)%>)</p>
		16	<% end %>
		17
		18	<% if @custom_field.format_in? 'list' %>
81	<p>	19	<p>
82	<%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>	20	<%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
83	<em class="info"><%= l(:text_custom_field_possible_values_info) %></em>	21	<em class="info"><%= l(:text_custom_field_possible_values_info) %></em>
84	</p>	22	</p>
		23	<% end %>
		24
		25	<% unless @custom_field.format_in? 'user', 'version' %>
85	<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>	26	<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
		27	<% end %>
		28
86	<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>	29	<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
87	</div>	30	</div>
88		31
@@ -127,4 +70,3 when "IssueCustomField" %>
127	<% end %>	70	<% end %>
128	<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>	71	<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
129	</div>	72	</div>
130	<%= javascript_tag "toggle_custom_field_format();" %>

app/views/custom_fields/edit.html.erb +1 -1

               &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
               &#187; <%=h @custom_field.name %></h2>
-            <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put} do |f| %>
+            <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put, :id => 'custom_field_form'} do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/custom_fields/new.html.erb +11 -1

@@ -2,8 +2,18
2	» <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>	2	» <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
3	» <%= l(:label_custom_field_new) %></h2>	3	» <%= l(:label_custom_field_new) %></h2>
4		4
5	<%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path do \|f\| %>	5	<%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path, :html => {:id => 'custom_field_form'} do \|f\| %>
6	<%= render :partial => 'form', :locals => { :f => f } %>	6	<%= render :partial => 'form', :locals => { :f => f } %>
7	<%= hidden_field_tag 'type', @custom_field.type %>	7	<%= hidden_field_tag 'type', @custom_field.type %>
8	<%= submit_tag l(:button_save) %>	8	<%= submit_tag l(:button_save) %>
9	<% end %>	9	<% end %>
		10
		11	<%= javascript_tag do %>
		12	$('#custom_field_field_format').change(function(){
		13	$.ajax({
		14	url: '<%= new_custom_field_path(:format => 'js') %>',
		15	type: 'get',
		16	data: $('#custom_field_form').serialize()
		17	});
		18	});
		19	<% end %>

test/functional/custom_fields_controller_test.rb +21 -24

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
-            require 'custom_fields_controller'
-            # Re-raise errors caught by the controller.
-            class CustomFieldsController; def rescue_action(e) raise e end; end
             class CustomFieldsControllerTest < ActionController::TestCase
               fixtures :custom_fields, :custom_values, :trackers, :users
               def setup
-                @controller = CustomFieldsController.new
-                @request    = ActionController::TestRequest.new
-                @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = 1
               end
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of klass, assigns(:custom_field)
-                  assert_tag :select, :attributes => {:name => 'custom_field[field_format]'}
+                  assert_select 'form#custom_field_form' do
+                    assert_select 'select#custom_field_field_format[name=?]', 'custom_field[field_format]'
+                    assert_select 'input[type=hidden][name=type][value=?]', klass.name
+                  end
                 end
               end
                 get :new, :type => 'IssueCustomField'
                 assert_response :success
                 assert_template 'new'
-                assert_tag :input, :attributes => {:name => 'custom_field[name]'}
+                assert_select 'form#custom_field_form' do
-                assert_tag :select,
+                  assert_select 'select#custom_field_field_format[name=?]', 'custom_field[field_format]' do
-                  :attributes => {:name => 'custom_field[field_format]'},
+                    assert_select 'option[value=user]', :text => 'User'
-                  :child => {
+                    assert_select 'option[value=version]', :text => 'Version'
-                    :tag => 'option',
+                  end
-                    :attributes => {:value => 'user'},
+                  assert_select 'input[type=hidden][name=type][value=IssueCustomField]'
-                    :content => 'User'
+                end
+              end
-                assert_tag :select,
-                  :attributes => {:name => 'custom_field[field_format]'},
+              def test_new_js
-                  :child => {
+                get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
-                    :tag => 'option',
+                assert_response :success
-                    :attributes => {:value => 'version'},
+                assert_template 'new'
-                    :content => 'Version'
+                assert_equal 'text/javascript', response.content_type
-                assert_tag :input, :attributes => {:name => 'type', :value => 'IssueCustomField'}
+                field = assigns(:custom_field)
+                assert_equal 'list', field.field_format
               end
               def test_new_with_invalid_custom_field_class_should_render_404

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