Download as
Browse Code »

Commit 5486976a86896c46ae4b557943a3ce6a75dfd516

Authored by AntonioTerceiro
1 parent bd8b5b89
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

ActionItem70: restricting to top-level categories 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@539 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @5486976
... ... @@ -23,7 +23,7 @@ class Environment < ActiveRecord::Base
23 23 has_many :profiles
24 24  
25 25 has_many :categories
26   - has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null ', :order => 'display_color'
  26 + has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
27 27  
28 28 # #################################################
29 29 # Attributes
... ...
test/unit/environment_test.rb
  Diff comments   View file @5486976
... ... @@ -128,6 +128,10 @@ class EnvironmentTest < Test::Unit::TestCase
128 128 cat1 = env.categories.create(:name => 'category one', :display_color => 1)
129 129 assert ! cat1.new_record?
130 130  
  131 + # subcategories should be ignored
  132 + subcat1 = env.categories.create(:name => 'subcategory one', :parent_id => cat1.id)
  133 + assert ! subcat1.new_record?
  134 +
131 135 cat2 = env.categories.create(:name => 'category two')
132 136 assert !cat2.new_record?
133 137  
... ...