jro_apps/redmine Commit - r3983:bd193a026df0

Refactor: convert VersionsController to a REST resource....

Eric Davis -

r3983:bd193a026df0

parent child

Context file:

r3983:bd193a026df0

Collapse all files

app/controllers/versions_controller.rb +2 -2

               end
               def update
-                if request.post? && params[:version]
+                if request.put? && params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
                   if @version.update_attributes(attributes)
               end
               def close_completed
-                if request.post?
+                if request.put?
                   @project.close_completed_versions
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project

app/views/projects/settings/_versions.rhtml +2 -2

                 <td class="buttons">
                 	<% if version.project == @project %>
                 		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
-                		<%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+                		<%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
                 	<% end %>
                	</td>
                 </tr>
             <div class="contextual">
             <% if @project.versions.any? %>
-            	<%= link_to l(:label_close_versions), {:controller => 'versions', :action => 'close_completed', :project_id => @project}, :method => :post %>
+            	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
             <% end %>
             </div>

app/views/versions/edit.rhtml +1 -1

             <h2><%=l(:label_version)%></h2>
-            <% labelled_tabular_form_for :version, @version, :url => { :action => 'update', :id => @version } do |f| %>
+            <% labelled_tabular_form_for :version, @version, :url => project_version_path(@project, @version), :html => {:method => :put} do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/versions/new.html.erb +1 -1

             <h2><%=l(:label_version_new)%></h2>
-            <% labelled_tabular_form_for :version, @version, :url => { :action => 'create', :project_id => @project } do |f| %>
+            <% labelled_tabular_form_for :version, @version, :url => project_versions_path(@project) do |f| %>
             <%= render :partial => 'versions/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <% end %>

config/routes.rb +5 -12

                 end
               end
+              # For nice "roadmap" in the url for the index action
+              map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
               map.resources :projects, :member => {
                 :copy => [:get, :post],
                 :settings => :get,
               } do |project|
                 project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
                 project.resources :files, :only => [:index, :new, :create]
+                project.resources :versions, :collection => {:close_completed => :put}
               end
               # Destroy uses a get request to prompt the user before the actual DELETE request
                 activity.connect 'activity', :id => nil
                 activity.connect 'activity.:format', :id => nil
               end
-              map.with_options :controller => 'versions' do |versions|
-                versions.connect 'projects/:project_id/versions/new', :action => 'new'
-                versions.connect 'projects/:project_id/roadmap', :action => 'index'
-                versions.connect 'versions/:action/:id', :conditions => {:method => :get}
-                versions.with_options :conditions => {:method => :post} do |version_actions|
-                  version_actions.connect 'projects/:project_id/versions', :action => 'create'
-                  version_actions.connect 'versions/update/:id', :action => 'update'
-                  version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed'
-                end
-              end
               map.with_options :controller => 'issue_categories' do |categories|
                 categories.connect 'projects/:project_id/issue_categories/new', :action => 'new'
               end

test/functional/versions_controller_test.rb +3 -3

               def test_close_completed
                 Version.update_all("status = 'open'")
                 @request.session[:user_id] = 2
-                post :close_completed, :project_id => 'ecookbook'
+                put :close_completed, :project_id => 'ecookbook'
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_not_nil Version.find_by_status('closed')
               end
               def test_post_update
                 @request.session[:user_id] = 2
-                post :update, :id => 2,
+                put :update, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
               def test_destroy
                 @request.session[:user_id] = 2
-                post :destroy, :id => 3
+                delete :destroy, :id => 3
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_nil Version.find_by_id(3)
               end

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