jro_apps/redmine Commit - r10841:ad246e81ad52

Code cleanup, use named routes....

Jean-Philippe Lang -

r10841:ad246e81ad52

parent child

Context file:

r10841:ad246e81ad52

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 +10 0

                 assert_response :success
                 assert_template 'bulk_edit'
+                assert_select 'ul#bulk-selection' do
+                  assert_select 'li', 2
+                  assert_select 'li a', :text => 'Bug #1'
+                end
+                assert_select 'form#bulk_edit_form[action=?]', '/issues/bulk_update' do
+                  assert_select 'input[name=?]', 'ids[]', 2
+                  assert_select 'input[name=?][value=1][type=hidden]', 'ids[]'
                   assert_select 'select[name=?]', 'issue[project_id]'
                   assert_select 'input[name=?]', 'issue[parent_issue_id]'
                     assert_select 'option[value=15]', 0
                   end
                 end
+              end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2

test/functional/timelog_controller_test.rb +8 -1

                 assert_response :success
                 assert_template 'bulk_edit'
+                assert_select 'ul#bulk-selection' do
+                  assert_select 'li', 2
+                  assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
+                end
+                assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
                   # System wide custom field
-                assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+                  assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
                   # Activities
                   assert_select 'select[name=?]', 'time_entry[activity_id]' do
                     assert_select 'option[value=9]', :text => 'Design'
                   end
                 end
+              end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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