comparison app/controllers/members_controller.rb @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch

 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  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.

   accept_api_auth :index, :show, :create, :update, :destroy
 
   def index
     @offset, @limit = api_offset_and_limit
     @member_count = @project.member_principals.count
-    @member_pages = Paginator.new self, @member_count, @limit, params['page']
-    @offset ||= @member_pages.current.offset
+    @member_pages = Paginator.new @member_count, @limit, params['page']
+    @offset ||= @member_pages.offset
     @members =  @project.member_principals.all(
       :order => "#{Member.table_name}.id",
       :limit  =>  @limit,
       :offset =>  @offset
     )

       end
       @project.members << members
     end
 
     respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      format.html { redirect_to_settings_in_projects }
       format.js { @members = members }
       format.api {
         @member = members.first
         if @member.valid?
           render :action => 'show', :status => :created, :location => membership_url(@member)

     if params[:membership]
       @member.role_ids = params[:membership][:role_ids]
     end
     saved = @member.save
     respond_to do |format|
-      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      format.html { redirect_to_settings_in_projects }
       format.js
       format.api {
         if saved
           render_api_ok
         else

   def destroy
     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.html { redirect_to_settings_in_projects }
       format.js
       format.api {
         if @member.destroyed?
           render_api_ok
         else

       }
     end
   end
 
   def autocomplete
-    @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
-    render :layout => false
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+
+  def redirect_to_settings_in_projects
+    redirect_to settings_project_path(@project, :tab => 'members')
   end
 end