Mercurial > hg > soundsoftware-site
diff app/controllers/members_controller.rb @ 500:d7326bb4f6f0 feature_142
Show styled member list in Members view for non-manager users; implement member editing partial in this view for manager users. Remove Members tab from Settings
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Wed, 13 Jul 2011 14:26:44 +0100 |
parents | 7a2bb9c5fb34 |
children | 5e80956cc792 |
line wrap: on
line diff
--- a/app/controllers/members_controller.rb Wed Jul 13 11:03:57 2011 +0100 +++ b/app/controllers/members_controller.rb Wed Jul 13 14:26:44 2011 +0100 @@ -61,11 +61,11 @@ respond_to do |format| if members.present? && members.all? {|m| m.valid? } - format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project } + format.html { redirect_to :action => 'index', :project_id => @project } format.js { render(:update) {|page| - page.replace_html "tab-content-members", :partial => 'projects/settings/members' + page.replace_html "memberlist", :partial => 'editlist' page << 'hideOnLoad()' members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") } } @@ -89,10 +89,10 @@ def edit if request.post? and @member.update_attributes(params[:member]) respond_to do |format| - format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project } + format.html { redirect_to :action => 'index', :project_id => @project } format.js { render(:update) {|page| - page.replace_html "tab-content-members", :partial => 'projects/settings/members' + page.replace_html "memberlist", :partial => 'editlist' page << 'hideOnLoad()' page.visual_effect(:highlight, "member-#{@member.id}") } @@ -106,9 +106,9 @@ @member.destroy end respond_to do |format| - format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project } + format.html { redirect_to :action => 'index', :project_id => @project } format.js { render(:update) {|page| - page.replace_html "tab-content-members", :partial => 'projects/settings/members' + page.replace_html "memberlist", :partial => 'editlist' page << 'hideOnLoad()' } }