Mercurial > hg > soundsoftware-site
diff app/controllers/versions_controller.rb @ 931:ec1c49528f36 cannam_integration
Merge from branch "redmine-1.3"
author | Chris Cannam |
---|---|
date | Wed, 27 Jun 2012 15:04:58 +0100 |
parents | 5f33065ddc4b |
children | 433d4f72a19b |
line wrap: on
line diff
--- a/app/controllers/versions_controller.rb Wed Jun 27 14:56:14 2012 +0100 +++ b/app/controllers/versions_controller.rb Wed Jun 27 15:04:58 2012 +0100 @@ -23,7 +23,7 @@ before_filter :find_project, :only => [:index, :new, :create, :close_completed] before_filter :authorize - accept_api_auth :index, :create, :update, :destroy + accept_api_auth :index, :show, :create, :update, :destroy helper :custom_fields helper :projects @@ -75,7 +75,7 @@ if params[:version] attributes = params[:version].dup attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing']) - @version.attributes = attributes + @version.safe_attributes = attributes end end @@ -85,7 +85,7 @@ if params[:version] attributes = params[:version].dup attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing']) - @version.attributes = attributes + @version.safe_attributes = attributes end if request.post? @@ -124,7 +124,8 @@ if request.put? && params[:version] attributes = params[:version].dup attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing']) - if @version.update_attributes(attributes) + @version.safe_attributes = attributes + if @version.save respond_to do |format| format.html { flash[:notice] = l(:notice_successful_update)