Default status per tracker (#5991).

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

6 files changed, 8 insertions, 7 deletions

diff --git a/app/views/issue_statuses/_form.html.erb b/app/views/issue_statuses/_form.html.erb
index 37898737c..2c333a304 100644
--- a/app/views/issue_statuses/_form.html.erb
+++ b/app/views/issue_statuses/_form.html.erb
@@ -6,7 +6,6 @@
   <p><%= f.select :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true, :label => :field_done_ratio %></p>
 <% end %>
 <p><%= f.check_box :is_closed %></p>
-<p><%= f.check_box :is_default %></p>
 
 <%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
 </div>
diff --git a/app/views/issue_statuses/index.api.rsb b/app/views/issue_statuses/index.api.rsb
index 8a51674d9..4f3b732d8 100644
--- a/app/views/issue_statuses/index.api.rsb
+++ b/app/views/issue_statuses/index.api.rsb
@@ -3,7 +3,6 @@ api.array :issue_statuses do
     api.issue_status do
       api.id status.id
       api.name status.name
-      api.is_default status.is_default
       api.is_closed status.is_closed
     end
   end
diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index 659dd18fa..d4a2ecbb2 100644
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -11,7 +11,6 @@
   <% if Issue.use_status_for_done_ratio? %>
   <th><%=l(:field_done_ratio)%></th>
   <% end %>
-  <th><%=l(:field_is_default)%></th>
   <th><%=l(:field_is_closed)%></th>
   <th><%=l(:button_sort)%></th>
   <th></th>
@@ -23,7 +22,6 @@
   <% if Issue.use_status_for_done_ratio? %>
   <td><%= h status.default_done_ratio %></td>
   <% end %>
-  <td><%= checked_image status.is_default? %></td>
   <td><%= checked_image status.is_closed? %></td>
   <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td>
   <td class="buttons">
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 7cae91f0c..01d262e57 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -5,9 +5,9 @@
 <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
                 :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
-
+<%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
 <% else %>
-<p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
+<p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
 <% end %>
 
 <% if @issue.safe_attribute? 'priority_id' %>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 4c73555f9..5a7416548 100644
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -4,8 +4,12 @@
 <div class="box tabular">
 <!--[form:tracker]-->
 <p><%= f.text_field :name, :required => true %></p>
+<p><%= f.select :default_status_id,
+        IssueStatus.sorted.map {|s| [s.name, s.id]},
+        :include_blank => @tracker.default_status.nil?,
+        :required => true %>
+</p>
 <p><%= f.check_box :is_in_roadmap %></p>
-
 <p>
   <label><%= l(:field_core_fields) %></label>
   <% Tracker::CORE_FIELDS.each do |field| %>
diff --git a/app/views/trackers/index.api.rsb b/app/views/trackers/index.api.rsb
index a37c552a8..de8579124 100644
--- a/app/views/trackers/index.api.rsb
+++ b/app/views/trackers/index.api.rsb
@@ -3,6 +3,7 @@ api.array :trackers do
     api.tracker do
       api.id tracker.id
       api.name tracker.name
+      api.default_status(:id => tracker.default_status.id, :name => tracker.default_status.name) unless tracker.default_status.nil?
     end
   end
 end