Merge branch 'api' into production

Victor Costa
2 parents 75689f5d f062bc1a
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
lib/noosfero/api/entities.rb
@@ -57,12 +57,11 @@ module Noosfero
  
       class CategoryBase < Entity
         root 'categories', 'category'
-        expose :name, :id
+        expose :name, :id, :slug
       end
  
       class Category < CategoryBase
         root 'categories', 'category'
-        expose :slug
         expose :full_name do |category, options|
           category.full_name
         end
...	...	@@ -57,12 +57,11 @@ module Noosfero
57	57
58	58	class CategoryBase < Entity
59	59	root 'categories', 'category'
60		- expose :name, :id
	60	+ expose :name, :id, :slug
61	61	end
62	62
63	63	class Category < CategoryBase
64	64	root 'categories', 'category'
65		- expose :slug
66	65	expose :full_name do \|category, options\|
67	66	category.full_name
68	67	end
...	...