##// END OF EJS Templates
jro_apps » redmine
RSS
Refactor: Extract method to the Member model...
Eric Davis -
r3487:b5d9a1dfbdba
parent child
Show More
Side by Side Unified
Context file:
r3487:b5d9a1dfbdba Loading diff...:
Show file before | Show file after | Hide comments
@@ -138,8 +138,7 class GroupsController < ApplicationController
138
138
139 def edit_membership
139 def edit_membership
140 @group = Group.find(params[:id])
140 @group = Group.find(params[:id])
141 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @group)
141 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
142 @membership.attributes = params[:membership]
143 @membership.save if request.post?
142 @membership.save if request.post?
144 respond_to do |format|
143 respond_to do |format|
145 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
144 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
Show file before | Show file after | Hide comments
@@ -120,8 +120,7 class UsersController < ApplicationController
120
120
121 def edit_membership
121 def edit_membership
122 @user = User.find(params[:id])
122 @user = User.find(params[:id])
123 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:principal => @user)
123 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
124 @membership.attributes = params[:membership]
125 @membership.save if request.post?
124 @membership.save if request.post?
126 respond_to do |format|
125 respond_to do |format|
127 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
126 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
Show file before | Show file after | Hide comments
@@ -72,6 +72,13 class Member < ActiveRecord::Base
72 end
72 end
73 end
73 end
74
74
75 # Find or initilize a Member with an id, attributes, and for a Principal
76 def self.edit_membership(id, new_attributes, principal=nil)
77 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
78 @membership.attributes = new_attributes
79 @membership
80 end
81
75 protected
82 protected
76
83
77 def validate
84 def validate
General Comments 0
You need to be logged in to leave comments. Login now