Mercurial > hg > soundsoftware-site
comparison app/controllers/versions_controller.rb @ 51:371eac10df0b live
* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
author | Chris Cannam |
---|---|
date | Wed, 24 Nov 2010 12:20:08 +0000 |
parents | 94944d00e43c |
children | cbb26bc654de |
comparison
equal
deleted
inserted
replaced
34:09b1d4349da3 | 51:371eac10df0b |
---|---|
107 attributes = params[:version].dup | 107 attributes = params[:version].dup |
108 attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing']) | 108 attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing']) |
109 if @version.update_attributes(attributes) | 109 if @version.update_attributes(attributes) |
110 flash[:notice] = l(:notice_successful_update) | 110 flash[:notice] = l(:notice_successful_update) |
111 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project | 111 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project |
112 else | |
113 respond_to do |format| | |
114 format.html { render :action => 'edit' } | |
115 end | |
112 end | 116 end |
113 end | 117 end |
114 end | 118 end |
115 | 119 |
116 def close_completed | 120 def close_completed |