jro_apps/redmine Commit - r7770:68f3e91bd703

Resourcified issue statuses....

Jean-Philippe Lang -

r7770:68f3e91bd703

parent child

Context file:

r7770:68f3e91bd703

Collapse all files

app/controllers/issue_statuses_controller.rb +4 -6

               before_filter :require_admin_or_api_request, :only => :index
               accept_api_auth :index
-              verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ],
-                     :redirect_to => { :action => :index }
               def index
                 respond_to do |format|
                   format.html {
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
-                if @issue_status.save
+                if request.post? && @issue_status.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index'
                 else
               def update
                 @issue_status = IssueStatus.find(params[:id])
-                if @issue_status.update_attributes(params[:issue_status])
+                if request.put? && @issue_status.update_attributes(params[:issue_status])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index'
                 else
                 end
               end
+              verify :method => :delete, :only => :destroy, :redirect_to => { :action => :index }
               def destroy
                 IssueStatus.find(params[:id]).destroy
                 redirect_to :action => 'index'
               end
               def update_issue_done_ratio
-                if IssueStatus.update_issue_done_ratios
+                if request.post? && IssueStatus.update_issue_done_ratios
                   flash[:notice] = l(:notice_issue_done_ratios_updated)
                 else
                   flash[:error] =  l(:error_issue_done_ratios_not_updated)

app/views/issue_statuses/_form.html.erb +5 -15

@@ -1,22 +1,12
1	<%= error_messages_for 'issue_status' %>	1	<%= error_messages_for 'issue_status' %>
2		2
3	<div class="box">	3	<div class="box tabular">
4	<!--[form:issue_status]-->	4	<p><%= f.text_field :name, :required => true %></p>
5	<p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label>
6	<%= text_field 'issue_status', 'name' %></p>
7
8	<% if Issue.use_status_for_done_ratio? %>	5	<% if Issue.use_status_for_done_ratio? %>
9	<p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>	6	<p><%= f.select :default_done_ratio, ((0..10).to_a.collect {\|r\| ["#{r10} %", r10] }), :include_blank => true, :label => :field_done_ratio %></p>
10	<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {\|r\| ["#{r10} %", r10] }), :include_blank => true %></p>
11	<% end %>	7	<% end %>
12		8	<p><%= f.check_box :is_closed %></p>
13	<p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>	9	<p><%= f.check_box :is_default %></p>
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>
18		10
19	<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>	11	<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
20
21	<!--[eoform:issue_status]-->
22	</div>	12	</div>

app/views/issue_statuses/edit.html.erb +3 -3

-            <h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=h @issue_status %></h2>
+            <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=h @issue_status %></h2>
-            <% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
+            <% form_for @issue_status, :builder => TabularFormBuilder do |f| %>
-              <%= render :partial => 'form' %>
+              <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/issue_statuses/index.html.erb +6 -6

             <div class="contextual">
-            <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %>
+            <%= link_to l(:label_issue_status_new), new_issue_status_path, :class => 'icon icon-add' %>
-            <%= link_to(l(:label_update_issue_done_ratios), {:action => 'update_issue_done_ratio'}, :class => 'icon icon-multiple', :method => 'post', :confirm => l(:text_are_you_sure)) if Issue.use_status_for_done_ratio? %>
+            <%= 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? %>
             </div>
             <h2><%=l(:label_issue_status_plural)%></h2>
               <tbody>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
-              <td><%= link_to h(status.name), :action => 'edit', :id => status %></td>
+              <td><%= link_to h(status.name), edit_issue_status_path(status) %></td>
               <% if Issue.use_status_for_done_ratio? %>
               <td align="center"><%= h status.default_done_ratio %></td>
               <% end %>
               <td align="center"><%= checked_image status.is_default? %></td>
               <td align="center"><%= checked_image status.is_closed? %></td>
-              <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td>
+              <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td>
               <td class="buttons">
-                <%= link_to(l(:button_delete), { :action => 'destroy', :id => status },
+                <%= link_to(l(:button_delete), issue_status_path(status),
-                                               :method => :post,
+                                               :method => :delete,
                                                :confirm => l(:text_are_you_sure),
                                                :class => 'icon icon-del') %>
               </td>

app/views/issue_statuses/new.html.erb +3 -3

-            <h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=l(:label_issue_status_new)%></h2>
+            <h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=l(:label_issue_status_new)%></h2>
-            <% form_tag({:action => 'create'}, :class => "tabular") do %>
+            <% form_for @issue_status, :builder => TabularFormBuilder do |f| %>
-              <%= render :partial => 'form' %>
+              <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
             <% end %>

config/routes.rb +1 -1

               map.resources :groups
               map.resources :trackers, :except => :show
+              map.resources :issue_statuses, :except => :show, :collection => {:update_issue_done_ratio => :post}
               #left old routes at the bottom for backwards compat
-              map.connect 'issue_statuses.:format', :controller => 'issue_statuses', :action => 'index'
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'

test/functional/issue_statuses_controller_test.rb +3 -3

               end
               def test_update
-                post :update, :id => '3', :issue_status => {:name => 'Renamed status'}
+                put :update, :id => '3', :issue_status => {:name => 'Renamed status'}
                 assert_redirected_to :action => 'index'
                 status = IssueStatus.find(3)
                 assert_equal 'Renamed status', status.name
                 Issue.delete_all("status_id = 1")
                 assert_difference 'IssueStatus.count', -1 do
-                  post :destroy, :id => '1'
+                  delete :destroy, :id => '1'
                 end
                 assert_redirected_to :action => 'index'
                 assert_nil IssueStatus.find_by_id(1)
                 assert_not_nil Issue.find_by_status_id(1)
                 assert_no_difference 'IssueStatus.count' do
-                  post :destroy, :id => '1'
+                  delete :destroy, :id => '1'
                 end
                 assert_redirected_to :action => 'index'
                 assert_not_nil IssueStatus.find_by_id(1)

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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