| @@ -22,9 +22,6 class IssueStatusesController < ApplicationController | |||
|
|
22 | 22 | before_filter :require_admin_or_api_request, :only => :index |
|
|
23 | 23 | accept_api_auth :index |
|
|
24 | 24 | |
|
|
25 | verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ], | |
|
|
26 | :redirect_to => { :action => :index } | |
|
|
27 | ||
|
|
28 | 25 | def index |
|
|
29 | 26 | respond_to do |format| |
|
|
30 | 27 | format.html { |
| @@ -43,7 +40,7 class IssueStatusesController < ApplicationController | |||
|
|
43 | 40 | |
|
|
44 | 41 | def create |
|
|
45 | 42 | @issue_status = IssueStatus.new(params[:issue_status]) |
|
|
46 | if @issue_status.save | |
|
|
43 | if request.post? && @issue_status.save | |
|
|
47 | 44 | flash[:notice] = l(:notice_successful_create) |
|
|
48 | 45 | redirect_to :action => 'index' |
|
|
49 | 46 | else |
| @@ -57,7 +54,7 class IssueStatusesController < ApplicationController | |||
|
|
57 | 54 | |
|
|
58 | 55 | def update |
|
|
59 | 56 | @issue_status = IssueStatus.find(params[:id]) |
|
|
60 | if @issue_status.update_attributes(params[:issue_status]) | |
|
|
57 | if request.put? && @issue_status.update_attributes(params[:issue_status]) | |
|
|
61 | 58 | flash[:notice] = l(:notice_successful_update) |
|
|
62 | 59 | redirect_to :action => 'index' |
|
|
63 | 60 | else |
| @@ -65,6 +62,7 class IssueStatusesController < ApplicationController | |||
|
|
65 | 62 | end |
|
|
66 | 63 | end |
|
|
67 | 64 | |
|
|
65 | verify :method => :delete, :only => :destroy, :redirect_to => { :action => :index } | |
|
|
68 | 66 | def destroy |
|
|
69 | 67 | IssueStatus.find(params[:id]).destroy |
|
|
70 | 68 | redirect_to :action => 'index' |
| @@ -74,7 +72,7 class IssueStatusesController < ApplicationController | |||
|
|
74 | 72 | end |
|
|
75 | 73 | |
|
|
76 | 74 | def update_issue_done_ratio |
|
|
77 | if IssueStatus.update_issue_done_ratios | |
|
|
75 | if request.post? && IssueStatus.update_issue_done_ratios | |
|
|
78 | 76 | flash[:notice] = l(:notice_issue_done_ratios_updated) |
|
|
79 | 77 | else |
|
|
80 | 78 | flash[:error] = l(:error_issue_done_ratios_not_updated) |
| @@ -1,22 +1,12 | |||
|
|
1 | 1 | <%= error_messages_for 'issue_status' %> |
|
|
2 | 2 | |
|
|
3 | <div class="box"> | |
|
|
4 | <!--[form:issue_status]--> | |
|
|
5 | <p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label> | |
|
|
6 | <%= text_field 'issue_status', 'name' %></p> | |
|
|
7 | ||
|
|
3 | <div class="box tabular"> | |
|
|
4 | <p><%= f.text_field :name, :required => true %></p> | |
|
|
8 | 5 | <% if Issue.use_status_for_done_ratio? %> |
|
|
9 | <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label> | |
|
|
10 | <%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true %></p> | |
|
|
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> | |
|
|
11 | 7 | <% end %> |
|
|
12 | ||
|
|
13 | <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label> | |
|
|
14 | <%= check_box 'issue_status', 'is_closed' %></p> | |
|
|
15 | ||
|
|
16 | <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label> | |
|
|
17 | <%= check_box 'issue_status', 'is_default' %></p> | |
|
|
8 | <p><%= f.check_box :is_closed %></p> | |
|
|
9 | <p><%= f.check_box :is_default %></p> | |
|
|
18 | 10 | |
|
|
19 | 11 | <%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %> |
|
|
20 | ||
|
|
21 | <!--[eoform:issue_status]--> | |
|
|
22 | 12 | </div> |
| @@ -1,6 +1,6 | |||
|
|
1 |
<h2><%= link_to l(:label_issue_status_plural), |
|
|
|
1 | <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> » <%=h @issue_status %></h2> | |
|
|
2 | 2 | |
|
|
3 | <% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %> | |
|
|
4 | <%= render :partial => 'form' %> | |
|
|
3 | <% form_for @issue_status, :builder => TabularFormBuilder do |f| %> | |
|
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
|
|
5 | 5 | <%= submit_tag l(:button_save) %> |
|
|
6 | 6 | <% end %> |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | <div class="contextual"> |
|
|
2 |
<%= link_to l(:label_issue_status_new), |
|
|
|
3 |
<%= link_to(l(:label_update_issue_done_ratios), |
|
|
|
2 | <%= link_to l(:label_issue_status_new), new_issue_status_path, :class => 'icon icon-add' %> | |
|
|
3 | <%= link_to(l(:label_update_issue_done_ratios), update_issue_done_ratio_issue_statuses_path, :class => 'icon icon-multiple', :method => 'post', :confirm => l(:text_are_you_sure)) if Issue.use_status_for_done_ratio? %> | |
|
|
4 | 4 | </div> |
|
|
5 | 5 | |
|
|
6 | 6 | <h2><%=l(:label_issue_status_plural)%></h2> |
| @@ -19,16 +19,16 | |||
|
|
19 | 19 | <tbody> |
|
|
20 | 20 | <% for status in @issue_statuses %> |
|
|
21 | 21 | <tr class="<%= cycle("odd", "even") %>"> |
|
|
22 |
<td><%= link_to h(status.name), |
|
|
|
22 | <td><%= link_to h(status.name), edit_issue_status_path(status) %></td> | |
|
|
23 | 23 | <% if Issue.use_status_for_done_ratio? %> |
|
|
24 | 24 | <td align="center"><%= h status.default_done_ratio %></td> |
|
|
25 | 25 | <% end %> |
|
|
26 | 26 | <td align="center"><%= checked_image status.is_default? %></td> |
|
|
27 | 27 | <td align="center"><%= checked_image status.is_closed? %></td> |
|
|
28 | <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td> | |
|
|
28 | <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td> | |
|
|
29 | 29 | <td class="buttons"> |
|
|
30 |
<%= link_to(l(:button_delete), |
|
|
|
31 |
:method => : |
|
|
|
30 | <%= link_to(l(:button_delete), issue_status_path(status), | |
|
|
31 | :method => :delete, | |
|
|
32 | 32 | :confirm => l(:text_are_you_sure), |
|
|
33 | 33 | :class => 'icon icon-del') %> |
|
|
34 | 34 | </td> |
| @@ -1,6 +1,6 | |||
|
|
1 |
<h2><%= link_to l(:label_issue_status_plural), |
|
|
|
1 | <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> » <%=l(:label_issue_status_new)%></h2> | |
|
|
2 | 2 | |
|
|
3 | <% form_tag({:action => 'create'}, :class => "tabular") do %> | |
|
|
4 | <%= render :partial => 'form' %> | |
|
|
3 | <% form_for @issue_status, :builder => TabularFormBuilder do |f| %> | |
|
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
|
|
5 | 5 | <%= submit_tag l(:button_create) %> |
|
|
6 | 6 | <% end %> |
| @@ -223,9 +223,9 ActionController::Routing::Routes.draw do |map| | |||
|
|
223 | 223 | |
|
|
224 | 224 | map.resources :groups |
|
|
225 | 225 | map.resources :trackers, :except => :show |
|
|
226 | map.resources :issue_statuses, :except => :show, :collection => {:update_issue_done_ratio => :post} | |
|
|
226 | 227 | |
|
|
227 | 228 | #left old routes at the bottom for backwards compat |
|
|
228 | map.connect 'issue_statuses.:format', :controller => 'issue_statuses', :action => 'index' | |
|
|
229 | 229 | map.connect 'projects/:project_id/issues/:action', :controller => 'issues' |
|
|
230 | 230 | map.connect 'projects/:project_id/documents/:action', :controller => 'documents' |
|
|
231 | 231 | map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards' |
| @@ -56,7 +56,7 class IssueStatusesControllerTest < ActionController::TestCase | |||
|
|
56 | 56 | end |
|
|
57 | 57 | |
|
|
58 | 58 | def test_update |
|
|
59 |
p |
|
|
|
59 | put :update, :id => '3', :issue_status => {:name => 'Renamed status'} | |
|
|
60 | 60 | assert_redirected_to :action => 'index' |
|
|
61 | 61 | status = IssueStatus.find(3) |
|
|
62 | 62 | assert_equal 'Renamed status', status.name |
| @@ -66,7 +66,7 class IssueStatusesControllerTest < ActionController::TestCase | |||
|
|
66 | 66 | Issue.delete_all("status_id = 1") |
|
|
67 | 67 | |
|
|
68 | 68 | assert_difference 'IssueStatus.count', -1 do |
|
|
69 |
|
|
|
|
69 | delete :destroy, :id => '1' | |
|
|
70 | 70 | end |
|
|
71 | 71 | assert_redirected_to :action => 'index' |
|
|
72 | 72 | assert_nil IssueStatus.find_by_id(1) |
| @@ -76,7 +76,7 class IssueStatusesControllerTest < ActionController::TestCase | |||
|
|
76 | 76 | assert_not_nil Issue.find_by_status_id(1) |
|
|
77 | 77 | |
|
|
78 | 78 | assert_no_difference 'IssueStatus.count' do |
|
|
79 |
|
|
|
|
79 | delete :destroy, :id => '1' | |
|
|
80 | 80 | end |
|
|
81 | 81 | assert_redirected_to :action => 'index' |
|
|
82 | 82 | assert_not_nil IssueStatus.find_by_id(1) |
General Comments 0
You need to be logged in to leave comments.
Login now