Download as
Browse Code »

Commit 6058722d735f154f65423f2fb78cfeb0f944f20d

Authored by MoisesMachado
1 parent 4d39d7f9
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

ActionItem616: fixed listing of recent private content 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2400 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 1 additions and 16 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @6058722
... ... @@ -77,7 +77,7 @@ class Article < ActiveRecord::Base
77 77 #
78 78 # Only includes articles where advertise == true
79 79 def self.recent(limit)
80   - options = { :limit => limit, :conditions => { :advertise => true }, :order => 'created_at desc, articles.id desc' }
  80 + options = { :limit => limit, :conditions => { :advertise => true, :public_article => true }, :order => 'created_at desc, articles.id desc' }
81 81 self.find(:all, options)
82 82 end
83 83  
... ...
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @6058722
... ... @@ -213,21 +213,6 @@ class ProfileEditorControllerTest < Test::Unit::TestCase
213 213 assert_equal false, Profile['ze'].public_profile
214 214 end
215 215  
216   - should 'display public_content field for editing' do
217   - profile = Profile['ze']
218   - get :edit, :profile => 'ze'
219   - assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_content]', :value => 'true' }
220   - assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_content]', :value => 'false' }
221   - end
222   -
223   - should 'display properly that the content is non-public' do
224   - profile = Profile['ze']
225   - profile.update_attributes(:public_content => false)
226   - get :edit, :profile => 'ze'
227   - assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_content]', :value => 'false' }
228   - assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_content]', :value => 'true' }
229   - end
230   -
231 216 should 'show error messages for invalid foundation_year' do
232 217 org = Organization.create!(:name => 'test org', :identifier => 'testorg')
233 218 post :edit, :profile => 'testorg', :profile_data => { :foundation_year => 'aaa' }
... ...