jro_apps/redmine Commit - r9355:d0d01d4e704b

0

app/models/board.rb +1 -1

               validates_length_of :name, :maximum => 30
               validates_length_of :description, :maximum => 255
-              named_scope :visible, lambda {|*args| { :include => :project,
+              scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
               safe_attributes 'name', 'description', 'move_to'

0

app/models/changeset.rb +2 -1

               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
-              named_scope :visible, lambda {|*args| { :include => {:repository => :project},
+              scope :visible,
+                 lambda {|*args| { :include => {:repository => :project},
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } }
               after_create :scan_for_issues

0

app/models/document.rb +1 -1

               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
-              named_scope :visible, lambda {|*args| { :include => :project,
+              scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_documents, *args) } }
               safe_attributes 'category_id', 'title', 'description'

0

app/models/enumeration.rb +3 -3

               validates_uniqueness_of :name, :scope => [:type, :project_id]
               validates_length_of :name, :maximum => 30
-              named_scope :shared, :conditions => { :project_id => nil }
+              scope :shared, :conditions => { :project_id => nil }
-              named_scope :active, :conditions => { :active => true }
+              scope :active, :conditions => { :active => true }
-              named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               def self.default
                 # Creates a fake default scope so Enumeration.default will check

0

app/models/issue.rb +8 -7

               validates_numericality_of :estimated_hours, :allow_nil => true
               validate :validate_issue
-              named_scope :visible, lambda {|*args| { :include => :project,
+              scope :visible,
-                                                      :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
+                    lambda {|*args| { :include => :project,
+                                      :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
-              named_scope :open, lambda {|*args|
+              scope :open, lambda {|*args|
                 is_closed = args.size > 0 ? !args.first : false
                 {:conditions => ["#{IssueStatus.table_name}.is_closed = ?", is_closed], :include => :status}
               }
-              named_scope :recently_updated, :order => "#{Issue.table_name}.updated_on DESC"
+              scope :recently_updated, :order => "#{Issue.table_name}.updated_on DESC"
-              named_scope :with_limit, lambda { |limit| { :limit => limit} }
+              scope :with_limit, lambda { |limit| { :limit => limit} }
-              named_scope :on_active_project, :include => [:status, :project, :tracker],
+              scope :on_active_project, :include => [:status, :project, :tracker],
-                                              :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
+                                        :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
               before_create :default_assign
               before_save :close_duplicates, :update_done_ratio_from_issue_status

0

app/models/issue_category.rb +1 -1

               safe_attributes 'name', 'assigned_to_id'
-              named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               alias :destroy_without_reassign :destroy

0

app/models/issue_status.rb +1 -1

               validates_length_of :name, :maximum => 30
               validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
-              named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               def update_default
                 IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?

0

app/models/journal.rb +1 -1

                                                           :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                                          " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
-              named_scope :visible, lambda {|*args| {
+              scope :visible, lambda {|*args| {
                 :include => {:issue => :project},
                 :conditions => Issue.visible_condition(args.shift || User.current, *args)
               }}

0

app/models/message.rb +1 -1

               after_update :update_messages_board
               after_destroy :reset_board_counters
-              named_scope :visible, lambda {|*args| { :include => {:board => :project},
+              scope :visible, lambda {|*args| { :include => {:board => :project},
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
               safe_attributes 'subject', 'content'

0

app/models/news.rb +1 -1

               after_create :add_author_as_watcher
-              named_scope :visible, lambda {|*args| {
+              scope :visible, lambda {|*args| {
                 :include => :project,
                 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_news, *args)
               }}

0

app/models/principal.rb +4 -4

               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               # Groups and active users
-              named_scope :active, :conditions => "#{Principal.table_name}.status = 1"
+              scope :active, :conditions => "#{Principal.table_name}.status = 1"
-              named_scope :like, lambda {|q|
+              scope :like, lambda {|q|
                 if q.blank?
                   {}
                 else
               }
               # Principals that are members of a collection of projects
-              named_scope :member_of, lambda {|projects|
+              scope :member_of, lambda {|projects|
                 projects = [projects] unless projects.is_a?(Array)
                 if projects.empty?
                   {:conditions => "1=0"}
                 end
               }
               # Principals that are not members of projects
-              named_scope :not_member_of, lambda {|projects|
+              scope :not_member_of, lambda {|projects|
                 projects = [projects] unless projects.is_a?(Array)
                 if projects.empty?
                   {:conditions => "1=0"}

0

app/models/project.rb +7 -7

               before_destroy :delete_all_members
-              named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
+              scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
-              named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
+              scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
-              named_scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }
+              scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }
-              named_scope :all_public, { :conditions => { :is_public => true } }
+              scope :all_public, { :conditions => { :is_public => true } }
-              named_scope :visible, lambda {|*args| {:conditions => Project.visible_condition(args.shift || User.current, *args) }}
+              scope :visible, lambda {|*args| {:conditions => Project.visible_condition(args.shift || User.current, *args) }}
-              named_scope :allowed_to, lambda {|*args|
+              scope :allowed_to, lambda {|*args|
                 user = User.current
                 permission = nil
                 if args.first.is_a?(Symbol)
                 end
                 { :conditions => Project.allowed_to_condition(user, permission, *args) }
               }
-              named_scope :like, lambda {|arg|
+              scope :like, lambda {|arg|
                 if arg.blank?
                   {}
                 else

0

app/models/query.rb +1 -1

               ]
               cattr_reader :available_columns
-              named_scope :visible, lambda {|*args|
+              scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 base = Project.allowed_to_condition(user, :view_issues, *args)
                 user_id = user.logged? ? user.id : 0

0

app/models/role.rb +3 -3

                 ['own', :label_issues_visibility_own]
               ]
-              named_scope :sorted, {:order => 'builtin, position'}
+              scope :sorted, {:order => 'builtin, position'}
-              named_scope :givable, { :conditions => "builtin = 0", :order => 'position' }
+              scope :givable, { :conditions => "builtin = 0", :order => 'position' }
-              named_scope :builtin, lambda { |*args|
+              scope :builtin, lambda { |*args|
                 compare = 'not' if args.first == true
                 { :conditions => "#{compare} builtin = 0" }
               }

0

app/models/time_entry.rb +4 -4

               before_validation :set_project_if_nil
               validate :validate_time_entry
-              named_scope :visible, lambda {|*args| {
+              scope :visible, lambda {|*args| {
                 :include => :project,
                 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
               }}
-              named_scope :on_issue, lambda {|issue| {
+              scope :on_issue, lambda {|issue| {
                 :include => :issue,
                 :conditions => "#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}"
               }}
-              named_scope :on_project, lambda {|project, include_subprojects| {
+              scope :on_project, lambda {|project, include_subprojects| {
                 :include => :project,
                 :conditions => project.project_condition(include_subprojects)
               }}
-              named_scope :spent_between, lambda {|from, to|
+              scope :spent_between, lambda {|from, to|
                 if from && to
                  {:conditions => ["#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to]}
                 elsif from

0

app/models/tracker.rb +1 -1

               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
-              named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               def to_s; name end

0

app/models/user.rb +5 -5

               belongs_to :auth_source
               # Active non-anonymous users scope
-              named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
+              scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
-              named_scope :logged, :conditions => "#{User.table_name}.status <> #{STATUS_ANONYMOUS}"
+              scope :logged, :conditions => "#{User.table_name}.status <> #{STATUS_ANONYMOUS}"
-              named_scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }
+              scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }
               acts_as_customizable
               before_save   :update_hashed_password
               before_destroy :remove_references_before_destroy
-              named_scope :in_group, lambda {|group|
+              scope :in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 { :conditions => ["#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id] }
               }
-              named_scope :not_in_group, lambda {|group|
+              scope :not_in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 { :conditions => ["#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id] }
               }

0

app/models/version.rb +3 -3

               validates_inclusion_of :status, :in => VERSION_STATUSES
               validates_inclusion_of :sharing, :in => VERSION_SHARINGS
-              named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
-              named_scope :open, :conditions => {:status => 'open'}
+              scope :open, :conditions => {:status => 'open'}
-              named_scope :visible, lambda {|*args| { :include => :project,
+              scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }
               safe_attributes 'name',

0

app/models/wiki_page.rb +1 -1

               before_save    :handle_redirects
               # eager load information about last updates, without loading text
-              named_scope :with_updated_on, {
+              scope :with_updated_on, {
                 :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                 :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id"
               }

	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