Refactor: Extract method to the Member model

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3601 e93f8b46-1217-0410-a6f0-8f06a7374b81

Refactor: Extract method to the Member model
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3601 e93f8b46-1217-0410-a6f0-8f06a7374b81
b5d9a1df · Eric Davis · f741ca72 · b5d9a1df · b5d9a1df · b5d9a1df
Commit b5d9a1df authored Mar 18, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

groups_controller.rb app/controllers/groups_controller.rb +1 -2

users_controller.rb app/controllers/users_controller.rb +1 -2

member.rb app/models/member.rb +7 -0

No files found.
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -138,8 +138,7 @@ class GroupsController < ApplicationController
  
  def edit_membership
    @group = Group.find(params[:id])
-    @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @group)
-    @membership.attributes = params[:membership]
+    @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
    @membership.save if request.post?
    respond_to do |format|
       format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -120,8 +120,7 @@ class UsersController < ApplicationController
  
  def edit_membership
    @user = User.find(params[:id])
-    @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @user)
-    @membership.attributes = params[:membership]
+    @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
    @membership.save if request.post?
    respond_to do |format|
       format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }

--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -71,6 +71,13 @@ class Member < ActiveRecord::Base
      IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
    end
  end
+
+  # Find or initilize a Member with an id, attributes, and for a Principal
+  def self.edit_membership(id, new_attributes, principal=nil)
+    @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
+    @membership.attributes = new_attributes
+    @membership
+  end
  
  protected