jro_apps/redmine Files · app/models/user_preference.rb

[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132)....

[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132). This commit updates the CSS styles to match with CodeRay 1.1.0, while it preserves the custom changes applied in r10132. The CSS styles were still based on CodeRay 1.0.6 (included since Redmine 1.4.0) with the custom changes from r10132 (included since Redmine 2.1.0). Redmine 2.3.2 till 2.3.4 came with CodeRay 1.0.9, an upgrade that didn't needed changes in the CSS styles. Starting with 2.4.0 Redmine comes with CodeRay 1.1.0, a minor upgrade that came with new/changed token_kinds and lots of changes in the alpha stylesheet, that in turn is used as a base for Redmine's own CodeRay CSS styles. As such, this upgrade needed CSS stylesheet changes like done before in r7618 and r7623 (for 1.0.0 upgrade) and r9389 (for 1.0.6 upgrade). But these changes, plus an update of the Redmine core documentation that is shipped along the core (wiki_syntax_detailed_[markdown|textile].html), aren't integrated up untill today. Contributed by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14488 e93f8b46-1217-0410-a6f0-8f06a7374b81

Jean-Philippe Lang - - Load All Authors

File last commit:

r13490:000124f44f53


                r14106:6fbb56e55735

Download file

             user_preference.rb
        
                    62 lines
            
             | 1.8 KiB
            
                | text/x-ruby
            
             |
                RubyLexer
            
             / app / models / user_preference.rb
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r6389
            
      # Redmine - project management software

        Jean-Philippe Lang
    
Copyright update....

              r13490
            
      # Copyright (C) 2006-2015  Jean-Philippe Lang

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
      #

      # 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.

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

              r6389
            
      #

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
      # 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.

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

              r6389
            
      #

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
      # 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 UserPreference < ActiveRecord::Base

        belongs_to :user

        Jean-Philippe Lang
    
removed serialize class_name option in user_preference...

              r171
            
        serialize :others

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

              r6389
            
        Jean-Philippe Lang
    
Set user_id as a protected attribute (#10390)....

              r9019
            
        attr_protected :others, :user_id

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

              r6389
            
        Toshi MARUYAMA
    
Rails3: model: replace deprecated before_save method at UserPreference model...

              r7950
            
        before_save :set_others_hash

        Toshi MARUYAMA
    
remove trailing white-space from app/models/user_preference.rb...

              r11440
            
        Jean-Philippe Lang
    
Makes models #initialize accept additional arguments....

              r8167
            
        def initialize(attributes=nil, *args)

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
          super

          self.others ||= {}

        end

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

              r6389
            
        Toshi MARUYAMA
    
Rails3: model: replace deprecated before_save method at UserPreference model...

              r7950
            
        def set_others_hash

        Jean-Philippe Lang
    
Fixed: 10342 Creation of Schema in Oracle...

              r476
            
          self.others ||= {}

        end

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

              r6389
            
        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
        def [](attr_name)

        Jean-Philippe Lang
    
Fixed usage of #attribute_present? in UserPreference (#13008)....

              r11896
            
          if has_attribute? attr_name

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
            super

          else

        Jean-Philippe Lang
    
Fixed: 10342 Creation of Schema in Oracle...

              r476
            
            others ? others[attr_name] : nil

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
          end

        end

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

              r6389
            
        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
        def []=(attr_name, value)

        Jean-Philippe Lang
    
Fixed usage of #attribute_present? in UserPreference (#13008)....

              r11896
            
          if has_attribute? attr_name

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
            super

          else

        Jean-Philippe Lang
    
Potential can't dup NilClass error in UserPreference (#11905)....

              r10255
            
            h = (read_attribute(:others) || {}).dup

        Jean-Philippe Lang
    
Merged Rails 2.1 compatibility branch....

              r1609
            
            h.update(attr_name => value)

            write_attribute(:others, h)

            value

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
          end

        end

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

              r6389
            
        Jean-Philippe Lang
    
Add a user preference to choose how comments/replies are displayed: in chronological or reverse chronological order (#589, #776)....

              r1183
            
        def comments_sorting; self[:comments_sorting] end

        def comments_sorting=(order); self[:comments_sorting]=order end

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

              r6389
            
        Jean-Philippe Lang
    
Warning on leaving a page with unsaved content in textarea (#2910)....

              r4780
            
        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

        Jean-Philippe Lang
    
Fixed that locking and unlocking a user resets the email notification checkbox (#14020)....

              r11609
            
        def no_self_notified; (self[:no_self_notified] == true || self[:no_self_notified] == '1'); end

        def no_self_notified=(value); self[:no_self_notified]=value; end

        Jean-Philippe Lang
    
- new controller "myController"...

              r60
            
      end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389	# Redmine - project management software
Jean-Philippe Lang Copyright update....	r13490	# Copyright (C) 2006-2015 Jean-Philippe Lang
Jean-Philippe Lang - new controller "myController"...	r60	#
		# 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.
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389	#
Jean-Philippe Lang - new controller "myController"...	r60	# 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.
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389	#
Jean-Philippe Lang - new controller "myController"...	r60	# 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 UserPreference < ActiveRecord::Base
		belongs_to :user
Jean-Philippe Lang removed serialize class_name option in user_preference...	r171	serialize :others
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Jean-Philippe Lang Set user_id as a protected attribute (#10390)....	r9019	attr_protected :others, :user_id
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Toshi MARUYAMA Rails3: model: replace deprecated before_save method at UserPreference model...	r7950	before_save :set_others_hash
Toshi MARUYAMA remove trailing white-space from app/models/user_preference.rb...	r11440
Jean-Philippe Lang Makes models #initialize accept additional arguments....	r8167	def initialize(attributes=nil, *args)
Jean-Philippe Lang - new controller "myController"...	r60	super
		self.others \|\|= {}
		end
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Toshi MARUYAMA Rails3: model: replace deprecated before_save method at UserPreference model...	r7950	def set_others_hash
Jean-Philippe Lang Fixed: 10342 Creation of Schema in Oracle...	r476	self.others \|\|= {}
		end
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Jean-Philippe Lang - new controller "myController"...	r60	def [](attr_name)
Jean-Philippe Lang Fixed usage of #attribute_present? in UserPreference (#13008)....	r11896	if has_attribute? attr_name
Jean-Philippe Lang - new controller "myController"...	r60	super
		else
Jean-Philippe Lang Fixed: 10342 Creation of Schema in Oracle...	r476	others ? others[attr_name] : nil
Jean-Philippe Lang - new controller "myController"...	r60	end
		end
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Jean-Philippe Lang - new controller "myController"...	r60	def []=(attr_name, value)
Jean-Philippe Lang Fixed usage of #attribute_present? in UserPreference (#13008)....	r11896	if has_attribute? attr_name
Jean-Philippe Lang - new controller "myController"...	r60	super
		else
Jean-Philippe Lang Potential can't dup NilClass error in UserPreference (#11905)....	r10255	h = (read_attribute(:others) \|\| {}).dup
Jean-Philippe Lang Merged Rails 2.1 compatibility branch....	r1609	h.update(attr_name => value)
		write_attribute(:others, h)
		value
Jean-Philippe Lang - new controller "myController"...	r60	end
		end
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Jean-Philippe Lang Add a user preference to choose how comments/replies are displayed: in chronological or reverse chronological order (#589, #776)....	r1183	def comments_sorting; self[:comments_sorting] end
		def comments_sorting=(order); self[:comments_sorting]=order end
Toshi MARUYAMA remove trailing white-spaces from app/models/user_preference.rb....	r6389
Jean-Philippe Lang Warning on leaving a page with unsaved content in textarea (#2910)....	r4780	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
Jean-Philippe Lang Fixed that locking and unlocking a user resets the email notification checkbox (#14020)....	r11609
		def no_self_notified; (self[:no_self_notified] == true \|\| self[:no_self_notified] == '1'); end
		def no_self_notified=(value); self[:no_self_notified]=value; end
Jean-Philippe Lang - new controller "myController"...	r60	end