jro_apps/redmine Commit - r10841:ad246e81ad52

Code cleanup, use named routes....

Jean-Philippe Lang -

r10841:ad246e81ad52

parent child

Context file:

r10841:ad246e81ad52

Collapse all files

app/views/issues/bulk_edit.html.erb +2 -2

              <h2><%= @copy ? l(:button_copy) : l(:label_bulk_edit_selected_issues) %></h2>
-             <ul>
+             <ul id="bulk-selection">
              <% @issues.each do |issue| %>
                <%= content_tag 'li', link_to_issue(issue) %>
              <% end %>
              </ul>
-             <%= form_tag({:action => 'bulk_update'}, :id => 'bulk_edit_form') do %>
+             <%= form_tag(bulk_update_issues_path, :id => 'bulk_edit_form') do %>
              <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
              <div class="box tabular">
              <fieldset class="attributes">

app/views/timelog/bulk_edit.html.erb +2 -2

              <h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
-             <ul>
+             <ul id="bulk-selection">
              <% @time_entries.each do |entry| %>
                <%= content_tag 'li',
                      link_to("#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => entry.hours)}", edit_time_entry_path(entry)) %>
              <% end %>
              </ul>
-             <%= form_tag(:action => 'bulk_update') do %>
+             <%= form_tag(bulk_update_time_entries_path, :id => 'bulk_edit_form') do %>
              <%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
              <div class="box tabular">
                <div>

test/functional/issues_controller_test.rb +25 -15

		@@ -3155,23 +3155,33 class IssuesControllerTest < ActionController::TestCase
3155	3155	assert_response :success
3156	3156	assert_template 'bulk_edit'
3157	3157
3158		assert_select 'select~~[name=?]'~~, ~~'issue[project_id]'~~
3159		assert_select 'input[name=?]', 'issue[parent_issue_id]'
3160
3161		# Project specific custom field, date type
3162		field = CustomField.find(9)
3163		assert !field.is_for_all?
3164		assert_equal 'date', field.field_format
3165		assert_select 'input[name=?]', 'issue[custom_field_values][9]'
	3158	assert_select 'ul#bulk-selection' do
	3159	assert_select 'li', 2
	3160	assert_select 'li a', :text => 'Bug #1'
	3161	end
3166	3162
3167		# System wide custom field
3168		assert CustomField.find(1).is_for_all?
3169		assert_select 'select[name=?]', 'issue[custom_field_values][1]'
	3163	assert_select 'form#bulk_edit_form[action=?]', '/issues/bulk_update' do
	3164	assert_select 'input[name=?]', 'ids[]', 2
	3165	assert_select 'input[name=?][value=1][type=hidden]', 'ids[]'
3170	3166
3171		# Be sure we don't display inactive IssuePriorities
3172		assert ! IssuePriority.find(15).active?
3173		assert_select 'select[name=?]', 'issue[priority_id]' do
3174		assert_select 'option[value=15]', 0
	3167	assert_select 'select[name=?]', 'issue[project_id]'
	3168	assert_select 'input[name=?]', 'issue[parent_issue_id]'
	3169
	3170	# Project specific custom field, date type
	3171	field = CustomField.find(9)
	3172	assert !field.is_for_all?
	3173	assert_equal 'date', field.field_format
	3174	assert_select 'input[name=?]', 'issue[custom_field_values][9]'
	3175
	3176	# System wide custom field
	3177	assert CustomField.find(1).is_for_all?
	3178	assert_select 'select[name=?]', 'issue[custom_field_values][1]'
	3179
	3180	# Be sure we don't display inactive IssuePriorities
	3181	assert ! IssuePriority.find(15).active?
	3182	assert_select 'select[name=?]', 'issue[priority_id]' do
	3183	assert_select 'option[value=15]', 0
	3184	end
3175	3185	end
3176	3186	end
3177	3187

test/functional/timelog_controller_test.rb +13 -6

                  assert_response :success
                  assert_template 'bulk_edit'
-                 # System wide custom field
-                 assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+                 assert_select 'ul#bulk-selection' do
+                   assert_select 'li', 2
+                   assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
+                 end
-                 # Activities
-                 assert_select 'select[name=?]', 'time_entry[activity_id]' do
-                   assert_select 'option[value=]', :text => '(No change)'
-                   assert_select 'option[value=9]', :text => 'Design'
+                 assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
+                   # System wide custom field
+                   assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
+                   # Activities
+                   assert_select 'select[name=?]', 'time_entry[activity_id]' do
+                     assert_select 'option[value=]', :text => '(No change)'
+                     assert_select 'option[value=9]', :text => 'Design'
+                   end
                  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