Bug correction. The article inside a Step, wasn't showing the step / track in the folder combo.

Eduardo Tourinho Edington · Victor Costa
1 parent b942e7fe
Showing 6 changed files with 42 additions and 10 deletions Show diff stats
app/models/article.rb
app/models/blog.rb
app/models/profile.rb
test/unit/article_test.rb
test/unit/blog_test.rb
test/unit/profile_test.rb
@@ -449,8 +449,8 @@ class Article &lt; ActiveRecord::Base
   end
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, :conditions => { :type => folder_types}
-  named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
+  named_scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
+  named_scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
@@ -6,7 +6,7 @@ class Blog &lt; Folder
   #FIXME This should be used until there is a migration to fix all blogs that
   # already have folders inside them
   def posts_with_no_folders
-    posts_without_no_folders.no_folders
+    posts_without_no_folders.no_folders(profile)
   end
   alias_method_chain :posts, :no_folders
@@ -760,8 +760,20 @@ private :generate_url, :url_options
     !environment.enabled?('disable_contact_' + self.class.name.downcase)
   end
+  include Noosfero::Plugin::HotSpot
+  
+  def folder_types
+    types = Article.folder_types
+    plugins.dispatch(:content_types).each {|type|
+      if type < Folder
+        types << type.name
+      end
+    }
+    types
+  end
+
   def folders
-    articles.folders
+    articles.folders(self)
   end
   def image_galleries
@@ -1405,30 +1405,32 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'return only folders' do
     not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
     folders = [Folder, Blog, Gallery, Forum]
+    profile = fast_create(Profile)
     not_folders.each do |klass|
       item = fast_create(klass)
-      assert_not_includes Article.folders, item
+      assert_not_includes Article.folders(profile), item
     end
     folders.each do |klass|
       item = fast_create(klass)
-      assert_includes Article.folders, item
+      assert_includes Article.folders(profile), item
     end
   end
   should 'return no folders' do
     not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
     folders = [Folder, Blog, Gallery, Forum]
+    profile = fast_create(Profile)
     not_folders.each do |klass|
       item = fast_create(klass)
-      assert_includes Article.no_folders, item
+      assert_includes Article.no_folders(profile), item
     end
     folders.each do |klass|
       item = fast_create(klass)
-      assert_not_includes Article.no_folders, item
+      assert_not_includes Article.no_folders(profile), item
     end
   end
@@ -198,7 +198,8 @@ class BlogTest &lt; ActiveSupport::TestCase
   #FIXME This should be used until there is a migration to fix all blogs that
   # already have folders inside them
   should 'not list folders in posts' do
-    blog = fast_create(Blog)
+    p = create_user('testuser').person
+    blog =  Blog.create!(:profile => p, :name => 'Blog test')
     folder = fast_create(Folder, :parent_id => blog.id)
     article = fast_create(TextileArticle, :parent_id => blog.id)
@@ -212,7 +213,8 @@ class BlogTest &lt; ActiveSupport::TestCase
   end
   should 'know when blog has or when has no posts' do
-    blog = fast_create(Blog)
+    p = create_user('testuser').person
+    blog =  Blog.create!(:profile => p, :name => 'Blog test')
     assert blog.empty?
     fast_create(TextileArticle, :parent_id => blog.id)
     assert ! blog.empty?
@@ -1888,4 +1888,20 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert !profile.may_display_location_to?(user)
   end
+  should 'folder_types search for folders in the plugins' do
+    class Folder1 < Folder
+    end
+    
+    class Plugin1 < Noosfero::Plugin
+      def content_types
+        [Folder1]
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    plugins = Noosfero::Plugin::Manager.new(environment, self)
+    p = fast_create(Profile)
+    assert p.folder_types.include?('ProfileTest::Folder1')
+  end
 end
	@@ -6,7 +6,7 @@ class Blog < Folder		@@ -6,7 +6,7 @@ class Blog < Folder
6	#FIXME This should be used until there is a migration to fix all blogs that	6	#FIXME This should be used until there is a migration to fix all blogs that
7	# already have folders inside them	7	# already have folders inside them
8	def posts_with_no_folders	8	def posts_with_no_folders
9	- posts_without_no_folders.no_folders	9	+ posts_without_no_folders.no_folders(profile)
10	end	10	end
11	alias_method_chain :posts, :no_folders	11	alias_method_chain :posts, :no_folders
12		12
	@@ -760,8 +760,20 @@ private :generate_url, :url_options		@@ -760,8 +760,20 @@ private :generate_url, :url_options
760	!environment.enabled?('disable_contact_' + self.class.name.downcase)	760	!environment.enabled?('disable_contact_' + self.class.name.downcase)
761	end	761	end
762		762
		763	+ include Noosfero::Plugin::HotSpot
		764	+
		765	+ def folder_types
		766	+ types = Article.folder_types
		767	+ plugins.dispatch(:content_types).each {\|type\|
		768	+ if type < Folder
		769	+ types << type.name
		770	+ end
		771	+ }
		772	+ types
		773	+ end
		774	+
763	def folders	775	def folders
764	- articles.folders	776	+ articles.folders(self)
765	end	777	end
766		778
767	def image_galleries	779	def image_galleries
	@@ -1888,4 +1888,20 @@ class ProfileTest < ActiveSupport::TestCase		@@ -1888,4 +1888,20 @@ class ProfileTest < ActiveSupport::TestCase
1888	assert !profile.may_display_location_to?(user)	1888	assert !profile.may_display_location_to?(user)
1889	end	1889	end
1890		1890
		1891	+ should 'folder_types search for folders in the plugins' do
		1892	+ class Folder1 < Folder
		1893	+ end
		1894	+
		1895	+ class Plugin1 < Noosfero::Plugin
		1896	+ def content_types
		1897	+ [Folder1]
		1898	+ end
		1899	+ end
		1900	+
		1901	+ environment = Environment.default
		1902	+ environment.enable_plugin(Plugin1)
		1903	+ plugins = Noosfero::Plugin::Manager.new(environment, self)
		1904	+ p = fast_create(Profile)
		1905	+ assert p.folder_types.include?('ProfileTest::Folder1')
		1906	+ end
1891	end	1907	end