Disable workflow checkboxes with no status change (#5593).

Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@17487 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 21 insertions, 7 deletions

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 142569e05..8ac75aa98 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -78,8 +78,10 @@ module WorkflowsHelper
     w = workflows.select {|w| w.old_status == old_status && w.new_status == new_status}.size
     
     tag_name = "transitions[#{ old_status.try(:id) || 0 }][#{new_status.id}][#{name}]"
-    if w == 0 || w == @roles.size * @trackers.size
-      
+    if old_status == new_status
+      check_box_tag(tag_name, "1", true,
+        {:disabled => true, :class => "old-status-#{old_status.try(:id) || 0} new-status-#{new_status.id}"})
+    elsif w == 0 || w == @roles.size * @trackers.size
       hidden_field_tag(tag_name, "0", :id => nil) +
       check_box_tag(tag_name, "1", w != 0,
             :class => "old-status-#{old_status.try(:id) || 0} new-status-#{new_status.id}")
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index 958c1e43c..542db4e35 100644
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -2,7 +2,7 @@
 <thead>
   <tr>
     <th>
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]')",
+      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled)')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
                            :class => 'icon-only icon-checked') %>
       <%=l(:label_current_status)%>
@@ -13,7 +13,7 @@
     <td></td>
     <% for new_status in @statuses %>
     <td style="width:<%= 75 / @statuses.size %>%;">
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox].new-status-#{new_status.id}')",
+      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).new-status-#{new_status.id}')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
                            :class => 'icon-only icon-checked') %>
       <%= new_status.name %>
@@ -26,7 +26,7 @@
   <% next if old_status.nil? && name != 'always' %>
   <tr>
     <td class="name">
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox].old-status-#{old_status.try(:id) || 0}')",
+      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).old-status-#{old_status.try(:id) || 0}')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
                            :class => 'icon-only icon-checked') %>
       <% if old_status %>
@@ -38,7 +38,7 @@
       <% end %>
     </td>
     <% for new_status in @statuses -%>
-    <% checked = workflows.detect {|w| w.old_status == old_status && w.new_status == new_status} %>
+    <% checked = (old_status == new_status) || workflows.detect {|w| w.old_status == old_status && w.new_status == new_status} %>
     <td class="<%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> &#187; <%= new_status.name %>">
       <%= transition_tag workflows, old_status, new_status, name %>
     </td>
diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index e1a58c35a..d33f4558d 100644
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_test.rb
@@ -110,7 +110,19 @@ class WorkflowsControllerTest < Redmine::ControllerTest
     assert_equal ["New issue"] + statuses,
       css_select('table.workflows.transitions-always tbody tr td:first').map(&:text).map(&:strip)
 
-    assert_select 'input[type=checkbox][name=?]', 'transitions[1][1][always]'
+    assert_select 'input[type=checkbox][name=?]', 'transitions[0][1][always]'
+  end
+
+  def test_get_edit_should_show_checked_disabled_transition_checkbox_between_same_statuses
+    get :edit, :params => {:role_id => 2, :tracker_id => 1}
+    assert_response :success
+    assert_select 'table.workflows.transitions-always tbody tr:nth-child(2)' do
+      assert_select 'td.name', :text => 'New'
+      # assert that the td is enabled
+      assert_select "td[title='New » New'][class=?]", 'enabled'
+      # assert that the checkbox is disabled and checked
+      assert_select "input[name='transitions[1][1][always]'][checked=?][disabled=?]", 'checked', 'disabled', 1
+    end
   end
 
   def test_post_edit