Download as
Browse Code »

Commit f97ba599e502b908350994be00b5fd672e174bcb

Authored by AntonioTerceiro
1 parent ae9a021d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem16: adding optional conditions to pending_for 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@858 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/models/task.rb
  Diff comments   View file @f97ba59
@@ -135,8 +135,8 @@ class Task < ActiveRecord::Base @@ -135,8 +135,8 @@ class Task < ActiveRecord::Base
135 135
136 class << self 136 class << self
137 137
138 - def pending_for(target)  
139 - self.find(:all, :conditions => { :target_id => target.id, :status => Task::Status::ACTIVE }) 138 + def pending_for(target, conditions= nil)
  139 + self.find(:all, :conditions => { :target_id => target.id, :status => Task::Status::ACTIVE }.merge(conditions || {}))
140 end 140 end
141 141
142 # generates a random code string consisting of 36 characters in the ranges 142 # generates a random code string consisting of 36 characters in the ranges
test/unit/task_test.rb
  Diff comments   View file @f97ba59
@@ -161,6 +161,16 @@ class TaskTest &lt; Test::Unit::TestCase @@ -161,6 +161,16 @@ class TaskTest &lt; Test::Unit::TestCase
161 assert_equal [task], Task.pending_for(target) 161 assert_equal [task], Task.pending_for(target)
162 end 162 end
163 163
  164 + should 'be able to pass extra conditions for getting pending tasks' do
  165 + target = sample_user
  166 +
  167 + task = Task.new
  168 + task.target = target
  169 + task.save!
  170 +
  171 + assert_equal [], Task.pending_for(target, :id => -1)
  172 + end
  173 +
164 protected 174 protected
165 175
166 def sample_user 176 def sample_user