##// END OF EJS Templates
remove trailing white-spaces from app/controllers/enumerations_controller.rb....
Toshi MARUYAMA -
r6785:b61c0983bc99
parent child
Show More
@@ -1,28 +1,28
1 # redMine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006 Jean-Philippe Lang
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class EnumerationsController < ApplicationController
18 class EnumerationsController < ApplicationController
19 layout 'admin'
19 layout 'admin'
20
20
21 before_filter :require_admin
21 before_filter :require_admin
22
22
23 helper :custom_fields
23 helper :custom_fields
24 include CustomFieldsHelper
24 include CustomFieldsHelper
25
25
26 def index
26 def index
27 list
27 list
28 render :action => 'list'
28 render :action => 'list'
@@ -39,7 +39,7 class EnumerationsController < ApplicationController
39 begin
39 begin
40 @enumeration = params[:type].constantize.new
40 @enumeration = params[:type].constantize.new
41 rescue NameError
41 rescue NameError
42 @enumeration = Enumeration.new
42 @enumeration = Enumeration.new
43 end
43 end
44 end
44 end
45
45
@@ -68,7 +68,7 class EnumerationsController < ApplicationController
68 render :action => 'edit'
68 render :action => 'edit'
69 end
69 end
70 end
70 end
71
71
72 def destroy
72 def destroy
73 @enumeration = Enumeration.find(params[:id])
73 @enumeration = Enumeration.find(params[:id])
74 if !@enumeration.in_use?
74 if !@enumeration.in_use?
General Comments 0
You need to be logged in to leave comments. Login now