From 7fc67f02f9823c123447c35687cafe406145d3d4 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 31 Aug 2011 13:10:44 +0000 Subject: [PATCH] remove trailing white-spaces from app/helpers/users_helper.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6910 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/users_helper.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index c0caffa4a..51ff99a9a 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,16 +1,16 @@ -# 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. @@ -18,12 +18,12 @@ module UsersHelper def users_status_options_for_select(selected) user_count_by_status = User.count(:group => 'status').to_hash - options_for_select([[l(:label_all), ''], + options_for_select([[l(:label_all), ''], ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1], ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2], ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected) end - + # Options for the new membership projects combo-box def options_for_membership_project_select(user, projects) options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") @@ -32,14 +32,14 @@ module UsersHelper end options end - + def user_mail_notification_options(user) user.valid_notification_options.collect {|o| [l(o.last), o.first]} end - + def change_status_link(user) url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil} - + if user.locked? link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock' elsif user.registered? @@ -48,7 +48,7 @@ module UsersHelper link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock' end end - + def user_settings_tabs tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general}, {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}