| @@ -6,6 +6,20 | |||||
| 6 | <p><%= f.text_field :name, :required => true %></p> |
|
6 | <p><%= f.text_field :name, :required => true %></p> | |
| 7 | <p><%= f.check_box :is_in_chlog %></p> |
|
7 | <p><%= f.check_box :is_in_chlog %></p> | |
| 8 | <p><%= f.check_box :is_in_roadmap %></p> |
|
8 | <p><%= f.check_box :is_in_roadmap %></p> | |
|
|
9 | ||||
|
|
10 | <% if IssueCustomField.all.any? %> | |||
|
|
11 | <p> | |||
|
|
12 | <label><%= l(:label_custom_field_plural) %></label> | |||
|
|
13 | <% IssueCustomField.all.each do |field| %> | |||
|
|
14 | <label class="block"> | |||
|
|
15 | <%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.include?(field) %> | |||
|
|
16 | <%=h field.name %> | |||
|
|
17 | </label> | |||
|
|
18 | <% end %> | |||
|
|
19 | </p> | |||
|
|
20 | <%= hidden_field_tag 'tracker[custom_field_ids][]', '' %> | |||
|
|
21 | <% end %> | |||
|
|
22 | ||||
| 9 | <% if @tracker.new_record? && @trackers.any? %> |
|
23 | <% if @tracker.new_record? && @trackers.any? %> | |
| 10 | <p><label><%= l(:label_copy_workflow_from) %></label> |
|
24 | <p><label><%= l(:label_copy_workflow_from) %></label> | |
| 11 | <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p> |
|
25 | <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p> | |
| @@ -22,7 +22,7 require 'trackers_controller' | |||||
| 22 | class TrackersController; def rescue_action(e) raise e end; end |
|
22 | class TrackersController; def rescue_action(e) raise e end; end | |
| 23 |
|
23 | |||
| 24 | class TrackersControllerTest < ActionController::TestCase |
|
24 | class TrackersControllerTest < ActionController::TestCase | |
| 25 | fixtures :trackers, :projects, :projects_trackers, :users, :issues |
|
25 | fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields | |
| 26 |
|
26 | |||
| 27 | def setup |
|
27 | def setup | |
| 28 | @controller = TrackersController.new |
|
28 | @controller = TrackersController.new | |
| @@ -45,10 +45,11 class TrackersControllerTest < ActionController::TestCase | |||||
| 45 | end |
|
45 | end | |
| 46 |
|
46 | |||
| 47 | def test_post_new |
|
47 | def test_post_new | |
| 48 | post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''] } |
|
48 | post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] } | |
| 49 | assert_redirected_to '/trackers/list' |
|
49 | assert_redirected_to '/trackers/list' | |
| 50 | tracker = Tracker.find_by_name('New tracker') |
|
50 | tracker = Tracker.find_by_name('New tracker') | |
| 51 | assert_equal [1], tracker.project_ids.sort |
|
51 | assert_equal [1], tracker.project_ids.sort | |
|
|
52 | assert_equal [1, 6], tracker.custom_field_ids | |||
| 52 | assert_equal 0, tracker.workflows.count |
|
53 | assert_equal 0, tracker.workflows.count | |
| 53 | end |
|
54 | end | |
| 54 |
|
55 | |||
General Comments 0
You need to be logged in to leave comments.
Login now