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

              class MembersController < ApplicationController
                model_object Member
-               before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
-               before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
-               before_filter :find_project, :only => [:new, :autocomplete_for_member]
+               before_filter :find_model_object, :except => [:create, :autocomplete]
+               before_filter :find_project_from_association, :except => [:create, :autocomplete]
+               before_filter :find_project_by_project_id, :only => [:create, :autocomplete]
                before_filter :authorize
-               def new
+               def create
                  members = []
-                 if params[:member] && request.post?
-                   attrs = params[:member].dup
+                 if params[:membership] && request.post?
+                   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
                end
-               def edit
-                 if request.post? and @member.update_attributes(params[:member])
+               def update
+                 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 {
                end
                def destroy
-                 if request.post? && @member.deletable?
+                 if request.delete? && @member.deletable?
                    @member.destroy
                  end
                  respond_to do |format|
                  end
                end
-               def autocomplete_for_member
+               def autocomplete
                  @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
                  render :layout => false
                end

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

                <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(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
-                                                       :method => :post,
+                   <% remote_form_for(:membership, member, :url => membership_path(member),
+                                                       :method => :put,
                                                        :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),
                                         :class => 'icon icon-edit' %>
                    <%= link_to_remote(
                          l(:button_delete),
-                         { :url => {:controller => 'members', :action => 'destroy', :id => member},
-                           :method => :post,
+                         { :url => membership_path(member),
+                           :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'
              <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>
                  <%= 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>

config/routes.rb +3 -9

                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',
                  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}

lib/redmine.rb +1 -1

                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

test/functional/members_controller_test.rb +12 -12

                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))
                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))
                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))
                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"
                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)
                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))
                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
-                 get :autocomplete_for_member, :id => 1, :q => 'mis'
+               def test_autocomplete
+                 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

              class RoutingMembersTest < ActionController::IntegrationTest
                def test_members
                  assert_routing(
-                     { :method => 'post', :path => "/projects/5234/members/new" },
-                     { :controller => 'members', :action => 'new', :id => '5234' }
+                     { :method => 'post', :path => "/projects/5234/memberships" },
+                     { :controller => 'members', :action => 'create', :project_id => '5234' }
                    )
                  assert_routing(
-                     { :method => 'post', :path => "/members/edit/5234" },
-                     { :controller => 'members', :action => 'edit', :id => '5234' }
+                     { :method => 'put', :path => "/memberships/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" },
-                     { :controller => 'members', :action => 'autocomplete_for_member', :id => '5234' }
+                     { :method => 'get', :path => "/projects/5234/memberships/autocomplete" },
+                     { :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