jro_apps/redmine Commit - r8669:78bd24c6f738

Resourcified project memberships....

Jean-Philippe Lang -

r8669:78bd24c6f738

parent child

Context file:

r8669:78bd24c6f738

Collapse all files

app/views/members/autocomplete.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= principals_check_box_tags 'membership[user_ids][]', @principals %>

app/controllers/members_controller.rb +13 -10

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MembersController < ApplicationController
               model_object Member
-              before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
+              before_filter :find_model_object, :except => [:create, :autocomplete]
-              before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
+              before_filter :find_project_from_association, :except => [:create, :autocomplete]
-              before_filter :find_project, :only => [:new, :autocomplete_for_member]
+              before_filter :find_project_by_project_id, :only => [:create, :autocomplete]
               before_filter :authorize
-              def new
+              def create
                 members = []
-                if params[:member] && request.post?
+                if params[:membership] && request.post?
-                  attrs = params[:member].dup
+                  attrs = params[:membership].dup
                   if (user_ids = attrs.delete(:user_ids))
                     user_ids.each do |user_id|
                       members << Member.new(attrs.merge(:user_id => user_id))
                     end
                   else
                     members << Member.new(attrs)
                   end
                   @project.members << members
                 end
                 respond_to do |format|
                   if members.present? && members.all? {|m| m.valid? }
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                         page << 'hideOnLoad()'
                         members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
                       }
                     }
                   else
                     format.js {
                       render(:update) {|page|
                         errors = members.collect {|m|
                           m.errors.full_messages
                         }.flatten.uniq
                         page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
                       }
                     }
                   end
                 end
               end
-              def edit
+              def update
-                if request.post? and @member.update_attributes(params[:member])
+                if params[:membership]
+                  @member.role_ids = params[:membership][:role_ids]
+                end
+                if request.put? && @member.save
               	 respond_to do |format|
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                         page << 'hideOnLoad()'
                         page.visual_effect(:highlight, "member-#{@member.id}")
                       }
                     }
                   end
                 end
               end
               def destroy
-                if request.post? && @member.deletable?
+                if request.delete? && @member.deletable?
                   @member.destroy
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                   format.js { render(:update) {|page|
                       page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                       page << 'hideOnLoad()'
                     }
                   }
                 end
               end
-              def autocomplete_for_member
+              def autocomplete
                 @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
                 render :layout => false
               end
             end

app/views/projects/settings/_members.html.erb +11 -12

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
                members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
               <thead><tr>
                 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
               </tr></thead>
               <tbody>
               <% members.each do |member| %>
               <% next if member.new_record? %>
               <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
               <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
-                <% if authorize_for('members', 'edit') %>
+                  <% remote_form_for(:membership, member, :url => membership_path(member),
-                  <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
+                                                      :method => :put,
-                                                      :method => :post,
                                                       :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
                     <p><% roles.each do |role| %>
-                    <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
+                    <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                                                    :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
                     <% end %></p>
-                    <%= hidden_field_tag 'member[role_ids][]', '' %>
+                    <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change), :class => "small" %>
                     <%= link_to_function l(:button_cancel),
                                          "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;"
                          %></p>
                   <% end %>
-                <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit' %>
                   <%= link_to_remote(
                         l(:button_delete),
-                        { :url => {:controller => 'members', :action => 'destroy', :id => member},
+                        { :url => membership_path(member),
-                          :method => :post,
+                          :method => :delete,
                           :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil) },
                         :title => l(:button_delete),
                         :class => 'icon icon-del'
                       ) if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
             <div class="splitcontentright">
             <% if roles.any? && principals.any? %>
-              <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
+              <% remote_form_for(:membership, @member, :url => project_memberships_path(@project), :method => :post,
                                  :loading => '$(\'member-add-submit\').disable();',
                                  :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
                 <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
                 <%= observe_field(:principal_search,
                              :frequency => 0.5,
                              :update => :principals,
-                             :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
+                             :url => autocomplete_project_memberships_path(@project),
+                             :method => :get,
                              :with => 'q')
                               %>
                 <div id="principals">
-                  <%= principals_check_box_tags 'member[user_ids][]', principals %>
+                  <%= principals_check_box_tags 'membership[user_ids][]', principals %>
                 </div>
                 <p><%= l(:label_role_plural) %>:
                 <% roles.each do |role| %>
-                  <label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
+                  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
                  <% end %></p>
                 <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

config/routes.rb +3 -9

             ActionController::Routing::Routes.draw do |map|
               # Add your own custom routes here.
               # The priority is based upon order of creation: first created -> highest priority.
               # Here's a sample route:
               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
               map.home '', :controller => 'welcome', :conditions => {:method => :get}
               map.signin 'login', :controller => 'account', :action => 'login',
                          :conditions => {:method => [:get, :post]}
               map.signout 'logout', :controller => 'account', :action => 'logout',
                           :conditions => {:method => :get}
               map.connect 'account/register', :controller => 'account', :action => 'register',
                           :conditions => {:method => [:get, :post]}
               map.connect 'account/lost_password', :controller => 'account', :action => 'lost_password',
                           :conditions => {:method => [:get, :post]}
               map.connect 'account/activate', :controller => 'account', :action => 'activate',
                           :conditions => {:method => :get}
               map.connect 'projects/:id/wiki', :controller => 'wikis',
                           :action => 'edit', :conditions => {:method => :post}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis',
                           :action => 'destroy', :conditions => {:method => [:get, :post]}
               map.with_options :controller => 'messages' do |messages_routes|
                 messages_routes.with_options :conditions => {:method => :get} do |messages_views|
                   messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
                   messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                 end
                 messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
                   messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_actions.connect 'boards/:board_id/topics/preview', :action => 'preview'
                   messages_actions.connect 'boards/:board_id/topics/quote/:id', :action => 'quote'
                   messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
                   messages_actions.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                   messages_actions.connect 'boards/:board_id/topics/:id/destroy', :action => 'destroy'
                 end
               end
               # Misc issue routes. TODO: move into resources
               map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes',
                                        :action => 'issues', :conditions => { :method => :get }
               # TODO: would look nicer as /issues/:id/preview
               map.preview_issue '/issues/preview/:id', :controller => 'previews',
                                 :action => 'issue'
               map.issues_context_menu '/issues/context_menu',
                                       :controller => 'context_menus', :action => 'issues'
               map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
               map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new',
                                :id => /\d+/, :conditions => { :method => :post }
               map.connect '/journals/diff/:id', :controller => 'journals', :action => 'diff',
                           :id => /\d+/, :conditions => { :method => :get }
               map.connect '/journals/edit/:id', :controller => 'journals', :action => 'edit',
                           :id => /\d+/, :conditions => { :method => [:get, :post] }
               map.with_options :controller => 'gantts', :action => 'show' do |gantts_routes|
                 gantts_routes.connect '/projects/:project_id/issues/gantt'
                 gantts_routes.connect '/projects/:project_id/issues/gantt.:format'
                 gantts_routes.connect '/issues/gantt.:format'
               end
               map.with_options :controller => 'calendars', :action => 'show' do |calendars_routes|
                 calendars_routes.connect '/projects/:project_id/issues/calendar'
                 calendars_routes.connect '/issues/calendar'
               end
               map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
                 reports.connect 'projects/:id/issues/report', :action => 'issue_report'
                 reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
               end
               map.connect 'my/account', :controller => 'my', :action => 'account',
                           :conditions => {:method => [:get, :post]}
               map.connect 'my/page', :controller => 'my', :action => 'page',
                           :conditions => {:method => :get}
               # Redirects to my/page
               map.connect 'my', :controller => 'my', :action => 'index',
                           :conditions => {:method => :get}
               map.connect 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key',
                           :conditions => {:method => :post}
               map.connect 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key',
                           :conditions => {:method => :post}
               map.connect 'my/password', :controller => 'my', :action => 'password',
                           :conditions => {:method => [:get, :post]}
               map.connect 'my/page_layout', :controller => 'my', :action => 'page_layout',
                           :conditions => {:method => :get}
               map.connect 'my/add_block', :controller => 'my', :action => 'add_block',
                           :conditions => {:method => :post}
               map.connect 'my/remove_block', :controller => 'my', :action => 'remove_block',
                           :conditions => {:method => :post}
               map.connect 'my/order_blocks', :controller => 'my', :action => 'order_blocks',
                           :conditions => {:method => :post}
-              map.connect 'projects/:id/members/new', :controller => 'members',
-                          :action => 'new', :conditions => { :method => :post }
-              map.connect 'members/edit/:id', :controller => 'members',
-                          :action => 'edit', :id => /\d+/, :conditions => { :method => :post }
-              map.connect 'members/destroy/:id', :controller => 'members',
-                          :action => 'destroy', :id => /\d+/, :conditions => { :method => :post }
-              map.connect 'members/autocomplete_for_member/:id', :controller => 'members',
-                          :action => 'autocomplete_for_member', :conditions => { :method => :post }
               map.with_options :controller => 'users' do |users|
                 users.user_membership 'users/:id/memberships/:membership_id',
                                       :action => 'edit_membership',
                                       :conditions => {:method => :put}
                 users.connect 'users/:id/memberships/:membership_id',
                               :action => 'destroy_membership',
                               :conditions => {:method => :delete}
                 users.user_memberships 'users/:id/memberships',
                                        :action => 'edit_membership',
                                        :conditions => {:method => :post}
               end
               map.resources :users
               # For nice "roadmap" in the url for the index action
               map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
               map.preview_news '/news/preview', :controller => 'previews', :action => 'news'
               map.connect 'news/:id/comments', :controller => 'comments',
                           :action => 'create', :conditions => {:method => :post}
               map.connect 'news/:id/comments/:comment_id', :controller => 'comments',
                           :action => 'destroy', :conditions => {:method => :delete}
               map.connect 'watchers/new', :controller=> 'watchers', :action => 'new',
                           :conditions => {:method => :get}
               map.connect 'watchers', :controller=> 'watchers', :action => 'create',
                           :conditions => {:method => :post}
               map.connect 'watchers/destroy', :controller=> 'watchers', :action => 'destroy',
                           :conditions => {:method => :post}
               map.connect 'watchers/watch', :controller=> 'watchers', :action => 'watch',
                           :conditions => {:method => :post}
               map.connect 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch',
                           :conditions => {:method => :post}
               map.connect 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user',
                           :conditions => {:method => :get}
               # TODO: port to be part of the resources route(s)
               map.with_options :conditions => {:method => :get} do |project_views|
                 project_views.connect 'projects/:id/settings/:tab',
                                       :controller => 'projects', :action => 'settings'
                 project_views.connect 'projects/:project_id/issues/:copy_from/copy',
                                       :controller => 'issues', :action => 'new'
               end
               map.resources :projects, :member => {
                 :copy => [:get, :post],
                 :settings => :get,
                 :modules => :post,
                 :archive => :post,
                 :unarchive => :post
               } do |project|
                 project.resource :enumerations, :controller => 'project_enumerations',
                                  :only => [:update, :destroy]
                 # issue form update
                 project.issue_form 'issues/new', :controller => 'issues',
                                    :action => 'new', :conditions => {:method => [:post, :put]}
                 project.resources :issues, :only => [:index, :new, :create] do |issues|
                   issues.resources :time_entries, :controller => 'timelog',
                                    :collection => {:report => :get}
                 end
                 project.resources :files, :only => [:index, :new, :create]
                 project.resources :versions, :shallow => true,
                                   :collection => {:close_completed => :put},
                                   :member => {:status_by => :post}
                 project.resources :news, :shallow => true
                 project.resources :time_entries, :controller => 'timelog',
                                   :collection => {:report => :get}
                 project.resources :queries, :only => [:new, :create]
                 project.resources :issue_categories, :shallow => true
                 project.resources :documents, :shallow => true, :member => {:add_attachment => :post}
                 project.resources :boards
                 project.resources :repositories, :shallow => true, :except => [:index, :show],
                                   :member => {:committers => [:get, :post]}
+                project.resources :memberships, :shallow => true, :controller => 'members',
+                                  :only => [:create, :update, :destroy],
+                                  :collection => {:autocomplete => :get}
                 project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
                 project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}
                 project.wiki_diff 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff', :version => nil
                 project.wiki_diff 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
                 project.wiki_annotate 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
                 project.resources :wiki, :except => [:new, :create], :member => {
                   :rename => [:get, :post],
                   :history => :get,
                   :preview => :any,
                   :protect => :post,
                   :add_attachment => :post
                 }, :collection => {
                   :export => :get,
                   :date_index => :get
                 }
               end
               map.connect 'news', :controller => 'news', :action => 'index'
               map.connect 'news.:format', :controller => 'news', :action => 'index'
               map.resources :queries, :except => [:show]
               map.resources :issues,
                             :collection => {:bulk_edit => [:get, :post], :bulk_update => :post} do |issues|
                 issues.resources :time_entries, :controller => 'timelog',
                                  :collection => {:report => :get}
                 issues.resources :relations, :shallow => true,
                                  :controller => 'issue_relations',
                                  :only => [:index, :show, :create, :destroy]
               end
               # Bulk deletion
               map.connect '/issues', :controller => 'issues', :action => 'destroy',
                           :conditions => {:method => :delete}
               map.connect '/time_entries/destroy',
                           :controller => 'timelog', :action => 'destroy',
                           :conditions => { :method => :delete }
               map.time_entries_context_menu '/time_entries/context_menu',
                                :controller => 'context_menus', :action => 'time_entries'
               map.resources :time_entries, :controller => 'timelog',
                             :collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post}
               map.with_options :controller => 'activities', :action => 'index',
                                :conditions => {:method => :get} do |activity|
                 activity.connect 'projects/:id/activity'
                 activity.connect 'projects/:id/activity.:format'
                 activity.connect 'activity', :id => nil
                 activity.connect 'activity.:format', :id => nil
               end
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository',
                                            :action => 'show'
                   repository_views.connect 'projects/:id/repository/:repository_id/statistics',
                                            :action => 'stats'
                   repository_views.connect 'projects/:id/repository/:repository_id/graph',
                                            :action => 'graph'
                   repository_views.connect 'projects/:id/repository/statistics',
                                            :action => 'stats'
                   repository_views.connect 'projects/:id/repository/graph',
                                            :action => 'graph'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions',
                                            :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions.:format',
                                            :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev',
                                            :action => 'revision'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/issues',
                                             :action => 'add_related_issue', :conditions => {:method => :post}
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id',
                                             :action => 'remove_related_issue', :conditions => {:method => :delete}
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff',
                                            :action => 'diff'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff.:format',
                                            :action => 'diff'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/raw/*path',
                                            :action => 'entry', :format => 'raw'
                   repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/:action/*path',
                                            :requirements => {
                                                :action => /(browse|show|entry|changes|annotate|diff)/,
                                                :rev    => /[a-z0-9\.\-_]+/
                                              }
                   repository_views.connect 'projects/:id/repository/:repository_id/raw/*path',
                                            :action => 'entry', :format => 'raw'
                   repository_views.connect 'projects/:id/repository/:repository_id/:action/*path',
                                            :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }
                   repository_views.connect 'projects/:id/repository/revisions',
                                            :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions.:format',
                                            :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions/:rev',
                                            :action => 'revision'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/issues',
                                             :action => 'add_related_issue', :conditions => {:method => :post}
                   repository_views.connect 'projects/:id/repository/revisions/:rev/issues/:issue_id',
                                             :action => 'remove_related_issue', :conditions => {:method => :delete}
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff',
                                            :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format',
                                            :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path',
                                            :action => 'entry', :format => 'raw'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path',
                                            :requirements => {
                                                :action => /(browse|show|entry|changes|annotate|diff)/,
                                                :rev    => /[a-z0-9\.\-_]+/
                                              }
                   repository_views.connect 'projects/:id/repository/raw/*path',
                                            :action => 'entry', :format => 'raw'
                   repository_views.connect 'projects/:id/repository/:action/*path',
                                            :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }
                   repository_views.connect 'projects/:id/repository/:repository_id',
                                            :action => 'show'
                 end
                 repositories.connect 'projects/:id/repository/revision',
                                      :action => 'revision',
                                      :conditions => {:method => [:get, :post]}
               end
               # additional routes for having the file name at the end of url
               map.connect 'attachments/:id/:filename', :controller => 'attachments',
                           :action => 'show', :id => /\d+/, :filename => /.*/,
                           :conditions => {:method => :get}
               map.connect 'attachments/download/:id/:filename', :controller => 'attachments',
                           :action => 'download', :id => /\d+/, :filename => /.*/,
                           :conditions => {:method => :get}
               map.connect 'attachments/download/:id', :controller => 'attachments',
                           :action => 'download', :id => /\d+/,
                           :conditions => {:method => :get}
               map.resources :attachments, :only => [:show, :destroy]
               map.resources :groups, :member => {:autocomplete_for_user => :get}
               map.group_users 'groups/:id/users', :controller => 'groups',
                               :action => 'add_users', :id => /\d+/,
                               :conditions => {:method => :post}
               map.group_user  'groups/:id/users/:user_id', :controller => 'groups',
                               :action => 'remove_user', :id => /\d+/,
                               :conditions => {:method => :delete}
               map.connect 'groups/destroy_membership/:id', :controller => 'groups',
                           :action => 'destroy_membership', :id => /\d+/,
                           :conditions => {:method => :post}
               map.connect 'groups/edit_membership/:id', :controller => 'groups',
                           :action => 'edit_membership', :id => /\d+/,
                           :conditions => {:method => :post}
               map.resources :trackers, :except => :show
               map.resources :issue_statuses, :except => :show, :collection => {:update_issue_done_ratio => :post}
               map.resources :custom_fields, :except => :show
               map.resources :roles, :except => :show, :collection => {:permissions => [:get, :post]}
               map.resources :enumerations, :except => :show
               map.connect 'search', :controller => 'search', :action => 'index', :conditions => {:method => :get}
               map.connect 'mail_handler', :controller => 'mail_handler',
                           :action => 'index', :conditions => {:method => :post}
               map.connect 'admin', :controller => 'admin', :action => 'index',
                           :conditions => {:method => :get}
               map.connect 'admin/projects', :controller => 'admin', :action => 'projects',
                           :conditions => {:method => :get}
               map.connect 'admin/plugins', :controller => 'admin', :action => 'plugins',
                           :conditions => {:method => :get}
               map.connect 'admin/info', :controller => 'admin', :action => 'info',
                           :conditions => {:method => :get}
               map.connect 'admin/test_email', :controller => 'admin', :action => 'test_email',
                           :conditions => {:method => :get}
               map.connect 'admin/default_configuration', :controller => 'admin',
                           :action => 'default_configuration', :conditions => {:method => :post}
               # Used by AuthSourcesControllerTest
               # TODO : refactor *AuthSourcesController to remove these routes
               map.connect 'auth_sources', :controller => 'auth_sources',
                           :action => 'index', :conditions => {:method => :get}
               map.connect 'auth_sources/new', :controller => 'auth_sources',
                           :action => 'new', :conditions => {:method => :get}
               map.connect 'auth_sources/create', :controller => 'auth_sources',
                           :action => 'create', :conditions => {:method => :post}
               map.connect 'auth_sources/destroy/:id', :controller => 'auth_sources',
                           :action => 'destroy', :id => /\d+/, :conditions => {:method => :post}
               map.connect 'auth_sources/test_connection/:id', :controller => 'auth_sources',
                           :action => 'test_connection', :conditions => {:method => :get}
               map.connect 'auth_sources/edit/:id', :controller => 'auth_sources',
                           :action => 'edit', :id => /\d+/, :conditions => {:method => :get}
               map.connect 'auth_sources/update/:id', :controller => 'auth_sources',
                           :action => 'update', :id => /\d+/, :conditions => {:method => :post}
               map.connect 'ldap_auth_sources', :controller => 'ldap_auth_sources',
                           :action => 'index', :conditions => {:method => :get}
               map.connect 'ldap_auth_sources/new', :controller => 'ldap_auth_sources',
                           :action => 'new', :conditions => {:method => :get}
               map.connect 'ldap_auth_sources/create', :controller => 'ldap_auth_sources',
                           :action => 'create', :conditions => {:method => :post}
               map.connect 'ldap_auth_sources/destroy/:id', :controller => 'ldap_auth_sources',
                           :action => 'destroy', :id => /\d+/, :conditions => {:method => :post}
               map.connect 'ldap_auth_sources/test_connection/:id', :controller => 'ldap_auth_sources',
                           :action => 'test_connection', :conditions => {:method => :get}
               map.connect 'ldap_auth_sources/edit/:id', :controller => 'ldap_auth_sources',
                           :action => 'edit', :id => /\d+/, :conditions => {:method => :get}
               map.connect 'ldap_auth_sources/update/:id', :controller => 'ldap_auth_sources',
                           :action => 'update', :id => /\d+/, :conditions => {:method => :post}
               map.connect 'workflows', :controller => 'workflows',
                           :action => 'index', :conditions => {:method => :get}
               map.connect 'workflows/edit', :controller => 'workflows',
                           :action => 'edit', :conditions => {:method => [:get, :post]}
               map.connect 'workflows/copy', :controller => 'workflows',
                           :action => 'copy', :conditions => {:method => [:get, :post]}
               map.connect 'settings', :controller => 'settings',
                           :action => 'index', :conditions => {:method => :get}
               map.connect 'settings/edit', :controller => 'settings',
                           :action => 'edit', :conditions => {:method => [:get, :post]}
               map.connect 'settings/plugin/:id', :controller => 'settings',
                           :action => 'plugin', :conditions => {:method => [:get, :post]}
               map.with_options :controller => 'sys' do |sys|
                 sys.connect 'sys/projects.:format',
                             :action => 'projects',
                             :conditions => {:method => :get}
                 sys.connect 'sys/projects/:id/repository.:format',
                             :action => 'create_project_repository',
                             :conditions => {:method => :post}
                 sys.connect 'sys/fetch_changesets',
                             :action => 'fetch_changesets',
                             :conditions => {:method => :get}
               end
               map.connect 'robots.txt', :controller => 'welcome',
                           :action => 'robots', :conditions => {:method => :get}
               # Used for OpenID
               map.root :controller => 'account', :action => 'login'
             end

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/search'
             require 'redmine/custom_field_format'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/notifiable'
             require 'redmine/wiki_formatting'
             require 'redmine/scm/base'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             if RUBY_VERSION < '1.9'
               require 'faster_csv'
             else
               require 'csv'
               FCSV = CSV
             end
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"
             Redmine::Scm::Base.add "Mercurial"
             Redmine::Scm::Base.add "Cvs"
             Redmine::Scm::Base.add "Bazaar"
             Redmine::Scm::Base.add "Git"
             Redmine::Scm::Base.add "Filesystem"
             Redmine::CustomFieldFormat.map do |fields|
               fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
               fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
               fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
               fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
               fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
               fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
               fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
               fields.register Redmine::CustomFieldFormat.new('user', :label => :label_user, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 8)
               fields.register Redmine::CustomFieldFormat.new('version', :label => :label_version, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 9)
             end
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
               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_members, {:projects => :settings, :members => [:create, :update, :destroy, :autocomplete]}, :require => :member
               map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:index, :show, :new, :create, :edit, :update, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:issues => [:index, :show],
                                               :auto_complete => [:issues],
                                               :context_menus => [:issues],
                                               :versions => [:index, :show, :status_by],
                                               :journals => [:index, :diff],
                                               :queries => :index,
                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
                 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
                 map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :set_issues_private, {}
                 map.permission :set_own_issues_private, {}, :require => :loggedin
                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
                 map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:index, :report, :show]
                 map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:comments => :create}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :create, :edit, :update, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                 map.permission :view_files, :files => :index, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
                 map.permission :export_wiki_pages, :wiki => [:export]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
                 map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
               map.project_module :calendar do |map|
                 map.permission :view_calendar, :calendars => [:show, :update]
               end
               map.project_module :gantt do |map|
                 map.permission :view_gantt, :gantts => [:show, :update]
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
               menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
               menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
               menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
               menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
               menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
                         :html => {:class => 'issue_statuses'}
               menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
               menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
                         :html => {:class => 'custom_fields'}
               menu.push :enumerations, {:controller => 'enumerations'}
               menu.push :settings, {:controller => 'settings'}
               menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
                         :html => {:class => 'server_authentication'}
               menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
               menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'activities', :action => 'index' }
               menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
               menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::Search.map do |search|
               search.register :issues
               search.register :news
               search.register :documents
               search.register :changesets
               search.register :wiki_pages
               search.register :messages
               search.register :projects
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end
             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

test/functional/members_controller_test.rb +12 -12

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'members_controller'
             # Re-raise errors caught by the controller.
             class MembersController; def rescue_action(e) raise e end; end
             class MembersControllerTest < ActionController::TestCase
               fixtures :projects, :members, :member_roles, :roles, :users
               def setup
                 @controller = MembersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 2
               end
               def test_create
                 assert_difference 'Member.count' do
-                  post :new, :id => 1, :member => {:role_ids => [1], :user_id => 7}
+                  post :create, :project_id => 1, :membership => {:role_ids => [1], :user_id => 7}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert User.find(7).member_of?(Project.find(1))
               end
               def test_create_multiple
                 assert_difference 'Member.count', 3 do
-                  post :new, :id => 1, :member => {:role_ids => [1], :user_ids => [7, 8, 9]}
+                  post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert User.find(7).member_of?(Project.find(1))
               end
               def test_xhr_create
                 assert_difference 'Member.count', 3 do
-                  post :new, :format => "js", :id => 1, :member => {:role_ids => [1], :user_ids => [7, 8, 9]}
+                  post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}, :format => "js"
                 end
                 assert_select_rjs :replace_html, 'tab-content-members'
                 assert User.find(7).member_of?(Project.find(1))
                 assert User.find(8).member_of?(Project.find(1))
                 assert User.find(9).member_of?(Project.find(1))
               end
               def test_xhr_create_with_failure
                 assert_no_difference 'Member.count' do
-                  post :new, :format => "js", :id => 1, :member => {:role_ids => [], :user_ids => [7, 8, 9]}
+                  post :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}, :format => "js"
                 end
                 assert_select '#tab-content-members', 0
                 assert @response.body.match(/alert/i), "Alert message not sent"
               end
               def test_edit
                 assert_no_difference 'Member.count' do
-                  post :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
+                  put :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
               end
               def test_xhr_edit
                 assert_no_difference 'Member.count' do
-                  xhr :post, :edit, :id => 2, :member => {:role_ids => [1], :user_id => 3}
+                  xhr :put, :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
                 end
                 assert_select_rjs :replace_html, 'tab-content-members'
                 member = Member.find(2)
                 assert_equal [1], member.role_ids
                 assert_equal 3, member.user_id
               end
               def test_destroy
                 assert_difference 'Member.count', -1 do
-                  post :destroy, :id => 2
+                  delete :destroy, :id => 2
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert !User.find(3).member_of?(Project.find(1))
               end
               def test_xhr_destroy
                 assert_difference 'Member.count', -1 do
-                  xhr :post, :destroy, :id => 2
+                  xhr :delete, :destroy, :id => 2
                 end
                 assert_select_rjs :replace_html, 'tab-content-members'
               end
-              def test_autocomplete_for_member
+              def test_autocomplete
-                get :autocomplete_for_member, :id => 1, :q => 'mis'
+                get :autocomplete, :project_id => 1, :q => 'mis'
                 assert_response :success
-                assert_template 'autocomplete_for_member'
+                assert_template 'autocomplete'
                 assert_tag :label, :content => /User Misc/,
-                                   :child => { :tag => 'input', :attributes => { :name => 'member[user_ids][]', :value => '8' } }
+                                   :child => { :tag => 'input', :attributes => { :name => 'membership[user_ids][]', :value => '8' } }
               end
             end

test/integration/routing/members_test.rb +7 -7

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class RoutingMembersTest < ActionController::IntegrationTest
               def test_members
                 assert_routing(
-                    { :method => 'post', :path => "/projects/5234/members/new" },
+                    { :method => 'post', :path => "/projects/5234/memberships" },
-                    { :controller => 'members', :action => 'new', :id => '5234' }
+                    { :controller => 'members', :action => 'create', :project_id => '5234' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/members/edit/5234" },
+                    { :method => 'put', :path => "/memberships/5234" },
-                    { :controller => 'members', :action => 'edit', :id => '5234' }
+                    { :controller => 'members', :action => 'update', :id => '5234' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/members/destroy/5234" },
+                    { :method => 'delete', :path => "/memberships/5234" },
                     { :controller => 'members', :action => 'destroy', :id => '5234' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/members/autocomplete_for_member/5234" },
+                    { :method => 'get', :path => "/projects/5234/memberships/autocomplete" },
-                    { :controller => 'members', :action => 'autocomplete_for_member', :id => '5234' }
+                    { :controller => 'members', :action => 'autocomplete', :project_id => '5234' }
                   )
               end
             end

app/views/members/autocomplete_for_member.html.erb removed 0 -1

NO CONTENT: file was removed

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