diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-04-11 17:47:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-04-11 17:47:29 +0000 |
| commit | 9ccccb9984851dba181322f77d30be8f20e627b7 (patch) | |
| tree | df02abaa25b5942075ce118f545b5af8d3d057e0 /app/controllers/versions_controller.rb | |
| parent | c76b9edf6c28a37731641d85be2bfbac3ba5b41c (diff) | |
| download | redmine-9ccccb9984851dba181322f77d30be8f20e627b7.tar.gz redmine-9ccccb9984851dba181322f77d30be8f20e627b7.zip | |
Do not raise an error when destroying a Version with assigned issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3668 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/versions_controller.rb')
| -rw-r--r-- | app/controllers/versions_controller.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index dc1b7eb2b..05c9743eb 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -80,11 +80,13 @@ class VersionsController < ApplicationController end def destroy - @version.destroy - redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project - rescue - flash[:error] = l(:notice_unable_delete_version) - redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project + if @version.fixed_issues.empty? + @version.destroy + redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project + else + flash[:error] = l(:notice_unable_delete_version) + redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project + end end def status_by |