summaryrefslogtreecommitdiffstats
path: root/app/controllers/roles_controller.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-31 08:43:49 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-31 08:43:49 +0000
commit01456d66a2871a9363ccb1d644199ae78f1a6dd2 (patch)
tree9659d5614b118c8b4b7e76cbbeb7824690869e2e /app/controllers/roles_controller.rb
parent011b505f9a92629590c64a71ba9ba5a43fc3d9c8 (diff)
downloadredmine-01456d66a2871a9363ccb1d644199ae78f1a6dd2.tar.gz
redmine-01456d66a2871a9363ccb1d644199ae78f1a6dd2.zip
remove trailing white-spaces from app/controllers/roles_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6869 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/roles_controller.rb')
-rw-r--r--app/controllers/roles_controller.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index efb084973..65152afd2 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,23 +1,23 @@
-# 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 RolesController < ApplicationController
layout 'admin'
-
+
before_filter :require_admin
verify :method => :post, :only => [ :destroy, :move ],
@@ -50,7 +50,7 @@ class RolesController < ApplicationController
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'index'
else
- @permissions = @role.setable_permissions
+ @permissions = @role.setable_permissions
end
end
@@ -62,8 +62,8 @@ class RolesController < ApplicationController
flash[:error] = l(:error_can_not_remove_role)
redirect_to :action => 'index'
end
-
- def report
+
+ def report
@roles = Role.find(:all, :order => 'builtin, position')
@permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
if request.post?