jro_apps/redmine Commit - r4033:2149add25c15

Merged r4088 from trunk....

Eric Davis -

r4033:2149add25c15

parent child

Context file:

r4033:2149add25c15

app/controllers/versions_controller.rb +4 -1

                   end
                 end
               end
               def edit
+              end
+              def update
                 if request.post? && params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])

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

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

config/routes.rb +3 0

               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 'versions/update/:id', :action => 'update'
                   version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed'
                 end
               end

lib/redmine.rb +1 -1

               map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
-              map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :close_completed, :destroy]}, :require => :member
+              map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :update, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|

test/functional/versions_controller_test.rb +2 -2

                 assert_not_nil Version.find_by_status('closed')
               end
-              def test_post_edit
+              def test_post_update
                 @request.session[:user_id] = 2
-                post :edit, :id => 2,
+                post :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'

test/integration/routing_test.rb +6 0

                 should_route :post, "/users/567/memberships/12/destroy", :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
               end
+              # TODO: should they all be scoped under /projects/:project_id ?
               context "versions" do
                 should_route :get, "/projects/foo/versions/new", :controller => 'versions', :action => 'new', :project_id => 'foo'
+                should_route :get, "/versions/show/1", :controller => 'versions', :action => 'show', :id => '1'
+                should_route :get, "/versions/edit/1", :controller => 'versions', :action => 'edit', :id => '1'
                 should_route :post, "/projects/foo/versions/new", :controller => 'versions', :action => 'new', :project_id => 'foo'
+                should_route :post, "/versions/update/1", :controller => 'versions', :action => 'update', :id => '1'
+                should_route :delete, "/versions/destroy/1", :controller => 'versions', :action => 'destroy', :id => '1'
               end
               context "wiki (singular, project's pages)" do

General Comments 0

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

No TODOs yet

	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