diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb index 92c0337..3a09c08 100644 --- a/app/controllers/issue_statuses_controller.rb +++ b/app/controllers/issue_statuses_controller.rb @@ -23,8 +23,14 @@ class IssueStatusesController < ApplicationController before_action :require_admin_or_api_request, :only => :index accept_api_auth :index + helper :sort + include SortHelper + def index - @issue_statuses = IssueStatus.sorted.to_a + sort_init 'name', 'asc' + sort_update %w(name position) + + @issue_statuses = IssueStatus.order(sort_clause).to_a respond_to do |format| format.html { render :layout => false if request.xhr? } format.api diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index f5e6538..f5f466e 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -12,6 +12,7 @@ <%=l(:field_done_ratio)%> <% end %> <%=l(:field_is_closed)%> + <%=l(:field_position)%> @@ -22,6 +23,7 @@ <%= status.default_done_ratio %> <% end %> <%= checked_image status.is_closed? %> + <%= status.position %> <%= reorder_handle(status) %> <%= delete_link issue_status_path(status) %> diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index f5f466e..d5b4e0d 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -7,12 +7,12 @@ - + <%= sort_header_tag('name', :caption => l(:field_name)) %> <% if Issue.use_status_for_done_ratio? %> <% end %> - + <%= sort_header_tag('position', :caption => l(:field_position)) %>
<%=l(:field_status)%><%=l(:field_done_ratio)%><%=l(:field_is_closed)%><%=l(:field_position)%>