jro_apps/redmine Commit - r3443:22c1e2b8cf85

Adds named scopes to replace custom finders....

Eric Davis -

r3443:22c1e2b8cf85

parent child

Context file:

r3443:22c1e2b8cf85

app/models/issue.rb +7 -1

               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               attr_reader :current_journal
               validates_presence_of :subject, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status
+              named_scope :recently_updated, :order => "#{self.table_name}.updated_on DESC"
+              named_scope :with_limit, lambda { |limit| { :limit => limit} }
+              named_scope :on_active_project, :include => [:status, :project, :tracker],
+                                              :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
               before_create :default_assign
               before_save :reschedule_following_issues, :close_duplicates, :update_done_ratio_from_issue_status
               after_save :create_journal

app/views/my/blocks/_issueswatched.rhtml +2 -7

@@ -1,10 +1,5
1	<h3><%=l(:label_watched_issues)%> (<%= Issue.visible.count(~~:include~~ => ~~:watchers~~,	1	<h3><%=l(:label_watched_issues)%> (<%= Issue.visible.watched_by(user.id).count %>)</h3>
2	:conditions => ["#{Watcher.table_name}.user_id = ?", user.id]) %>)</h3>	2	<% watched_issues = Issue.visible.on_active_project.watched_by(user.id).recently_updated.with_limit(10) %>
3	<% watched_issues = Issue.visible.find(:all,
4	:include => [:status, :project, :tracker, :watchers],
5	:limit => 10,
6	:conditions => ["#{Watcher.table_name}.user_id = ?", user.id],
7	:order => "#{Issue.table_name}.updated_on DESC") %>
8		3
9	<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>	4	<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
10	<% if watched_issues.length > 0 %>	5	<% if watched_issues.length > 0 %>

test/unit/issue_test.rb +20 0

@@ -656,4 +656,24 class IssueTest < ActiveSupport::TestCase
656	assert_equal 2, groups.size	656	assert_equal 2, groups.size
657	assert_equal 5, groups.inject(0) {\|sum, group\| sum + group['total'].to_i}	657	assert_equal 5, groups.inject(0) {\|sum, group\| sum + group['total'].to_i}
658	end	658	end
		659
		660	def test_recently_updated_with_limit_scopes
		661	#should return the last updated issue
		662	assert_equal 1, Issue.recently_updated.with_limit(1).length
		663	assert_equal Issue.find(:first, :order => "updated_on DESC"), Issue.recently_updated.with_limit(1).first
		664	end
		665
		666	def test_on_active_projects_scope
		667	assert Project.find(2).archive
		668
		669	before = Issue.on_active_project.length
		670	# test inclusion to results
		671	issue = Issue.generate_for_project!(Project.find(1), :tracker => Project.find(2).trackers.first)
		672	assert_equal before + 1, Issue.on_active_project.length
		673
		674	# Move to an archived project
		675	issue.project = Project.find(2)
		676	assert issue.save
		677	assert_equal before, Issue.on_active_project.length
		678	end
659	end	679	end

vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +5 -8

                         has_many :watchers, :as => :watchable, :dependent => :delete_all
                         has_many :watcher_users, :through => :watchers, :source => :user
+                        named_scope :watched_by, lambda { |user_id|
+                          { :include => :watchers,
+                            :conditions => ["#{Watcher.table_name}.user_id = ?", user_id] }
+                        }
                         attr_protected :watcher_ids, :watcher_user_ids
                       end
                     end
                       notified.collect(&:mail).compact
                     end
-                    module ClassMethods
+                    module ClassMethods; end
-                      # Returns the objects that are watched by user
-                      def watched_by(user)
-                        find(:all,
-                             :include => :watchers,
-                             :conditions => ["#{Watcher.table_name}.user_id = ?", user.id])
-                      end
-                    end
                   end
                 end
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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