diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 539a221fd..73d39dd4d 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -1,28 +1,28 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class EnumerationsController < ApplicationController layout 'admin' - + before_filter :require_admin helper :custom_fields include CustomFieldsHelper - + def index list render :action => 'list' @@ -39,7 +39,7 @@ class EnumerationsController < ApplicationController begin @enumeration = params[:type].constantize.new rescue NameError - @enumeration = Enumeration.new + @enumeration = Enumeration.new end end @@ -68,7 +68,7 @@ class EnumerationsController < ApplicationController render :action => 'edit' end end - + def destroy @enumeration = Enumeration.find(params[:id]) if !@enumeration.in_use?