remove trailing white-spaces from app/models/user_preference.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6509 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-21 01:58:55 +00:00
parent 04fe3babc1
commit a20b4c6b23

View File

@ -1,16 +1,16 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@ -18,18 +18,18 @@
class UserPreference < ActiveRecord::Base class UserPreference < ActiveRecord::Base
belongs_to :user belongs_to :user
serialize :others serialize :others
attr_protected :others attr_protected :others
def initialize(attributes = nil) def initialize(attributes = nil)
super super
self.others ||= {} self.others ||= {}
end end
def before_save def before_save
self.others ||= {} self.others ||= {}
end end
def [](attr_name) def [](attr_name)
if attribute_present? attr_name if attribute_present? attr_name
super super
@ -37,7 +37,7 @@ class UserPreference < ActiveRecord::Base
others ? others[attr_name] : nil others ? others[attr_name] : nil
end end
end end
def []=(attr_name, value) def []=(attr_name, value)
if attribute_present? attr_name if attribute_present? attr_name
super super
@ -48,10 +48,10 @@ class UserPreference < ActiveRecord::Base
value value
end end
end end
def comments_sorting; self[:comments_sorting] end def comments_sorting; self[:comments_sorting] end
def comments_sorting=(order); self[:comments_sorting]=order end def comments_sorting=(order); self[:comments_sorting]=order end
def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
end end