Download as
Browse Code »

Commit f97ba599e502b908350994be00b5fd672e174bcb

Authored by AntonioTerceiro
1 parent ae9a021d
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 135  
136 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 140 end
141 141  
142 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 161 assert_equal [task], Task.pending_for(target)
162 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 174 protected
165 175  
166 176 def sample_user
... ...