| @@ -138,8 +138,7 class GroupsController < ApplicationController | |||
|
|
138 | 138 | |
|
|
139 | 139 | def edit_membership |
|
|
140 | 140 | @group = Group.find(params[:id]) |
|
|
141 |
@membership = |
|
|
|
142 | @membership.attributes = params[:membership] | |
|
|
141 | @membership = Member.edit_membership(params[:membership_id], params[:membership], @group) | |
|
|
143 | 142 | @membership.save if request.post? |
|
|
144 | 143 | respond_to do |format| |
|
|
145 | 144 | format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' } |
| @@ -120,8 +120,7 class UsersController < ApplicationController | |||
|
|
120 | 120 | |
|
|
121 | 121 | def edit_membership |
|
|
122 | 122 | @user = User.find(params[:id]) |
|
|
123 |
@membership = |
|
|
|
124 | @membership.attributes = params[:membership] | |
|
|
123 | @membership = Member.edit_membership(params[:membership_id], params[:membership], @user) | |
|
|
125 | 124 | @membership.save if request.post? |
|
|
126 | 125 | respond_to do |format| |
|
|
127 | 126 | format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' } |
| @@ -71,6 +71,13 class Member < ActiveRecord::Base | |||
|
|
71 | 71 | IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id] |
|
|
72 | 72 | end |
|
|
73 | 73 | end |
|
|
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 | |
|
|
74 | 81 | |
|
|
75 | 82 | protected |
|
|
76 | 83 | |
General Comments 0
You need to be logged in to leave comments.
Login now