jro_apps/redmine Commit - r3031:34d14be556e3

Adds custom field selection on tracker form....

Jean-Philippe Lang -

r3031:34d14be556e3

parent child

Context file:

r3031:34d14be556e3

Collapse all files

app/views/trackers/_form.rhtml +14 0

             <%= error_messages_for 'tracker' %>
             <div class="splitcontentleft">
             <div class="box tabular">
             <!--[form:tracker]-->
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.check_box :is_in_chlog %></p>
             <p><%= f.check_box :is_in_roadmap %></p>
+            <% if IssueCustomField.all.any? %>
+            <p>
+            	<label><%= l(:label_custom_field_plural) %></label>
+            	<% IssueCustomField.all.each do |field| %>
+            		<label class="block">
+            			<%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.include?(field) %>
+            			<%=h field.name %>
+            		</label>
+            	<% end %>
+            </p>
+            <%= hidden_field_tag 'tracker[custom_field_ids][]', '' %>
+            <% end %>
             <% if @tracker.new_record? && @trackers.any? %>
             <p><label><%= l(:label_copy_workflow_from) %></label>
             <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
             <% end %>
             <!--[eoform:tracker]-->
             </div>
             </div>
             <div class="splitcontentright">
             <% if @projects.any? %>
             <fieldset class="box" id="tracker_project_ids"><legend><%= l(:label_project_plural) %></legend>
             <%= project_nested_ul(@projects) do |p|
               content_tag('label', check_box_tag('tracker[project_ids][]', p.id, @tracker.projects.include?(p), :id => nil) + ' ' + h(p))
             end %>
             <%= hidden_field_tag('tracker[project_ids][]', '', :id => nil) %>
             <p><%= check_all_links 'tracker_project_ids' %></p>
             </fieldset>
             <% end %>
             </div>

test/functional/trackers_controller_test.rb +3 -2

             # Redmine - project management software
             # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'trackers_controller'
             # Re-raise errors caught by the controller.
             class TrackersController; def rescue_action(e) raise e end; end
             class TrackersControllerTest < ActionController::TestCase
-              fixtures :trackers, :projects, :projects_trackers, :users, :issues
+              fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields
               def setup
                 @controller = TrackersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'list'
               end
               def test_get_new
                 get :new
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
-                post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''] }
+                post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
                 assert_redirected_to '/trackers/list'
                 tracker = Tracker.find_by_name('New tracker')
                 assert_equal [1], tracker.project_ids.sort
+                assert_equal [1, 6], tracker.custom_field_ids
                 assert_equal 0, tracker.workflows.count
               end
               def test_post_new_with_workflow_copy
                 post :new, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
                 assert_redirected_to '/trackers/list'
                 tracker = Tracker.find_by_name('New tracker')
                 assert_equal 0, tracker.projects.count
                 assert_equal Tracker.find(1).workflows.count, tracker.workflows.count
               end
               def test_get_edit
                 Tracker.find(1).project_ids = [1, 3]
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '1',
                                                     :checked => 'checked' }
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '2',
                                                     :checked => nil }
                 assert_tag :input, :attributes => { :name => 'tracker[project_ids][]',
                                                     :value => '',
                                                     :type => 'hidden'}
               end
               def test_post_edit
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => ['1', '2', ''] }
                 assert_redirected_to '/trackers/list'
                 assert_equal [1, 2], Tracker.find(1).project_ids.sort
               end
               def test_post_edit_without_projects
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => [''] }
                 assert_redirected_to '/trackers/list'
                 assert Tracker.find(1).project_ids.empty?
               end
               def test_move_lower
                tracker = Tracker.find_by_position(1)
                post :edit, :id => 1, :tracker => { :move_to => 'lower' }
                assert_equal 2, tracker.reload.position
               end
               def test_destroy
                 tracker = Tracker.create!(:name => 'Destroyable')
                 assert_difference 'Tracker.count', -1 do
                   post :destroy, :id => tracker.id
                 end
                 assert_redirected_to '/trackers/list'
                 assert_nil flash[:error]
               end
               def test_destroy_tracker_in_use
                 assert_no_difference 'Tracker.count' do
                   post :destroy, :id => 1
                 end
                 assert_redirected_to '/trackers/list'
                 assert_not_nil flash[:error]
               end
             end

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