Merge branch 'ai2992' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2992

Rodrigo Souto
2 parents 7635668e 10ab44f4
Showing 3 changed files with 11 additions and 1 deletions Show diff stats
app/controllers/my_profile/themes_controller.rb
lib/noosfero/core_ext.rb
lib/noosfero/core_ext/array.rb
@@ -14,7 +14,7 @@ class ThemesController &lt; MyProfileController
   end
   def index
-    @themes = profile.environment.themes + Theme.approved_themes(profile)
+    @themes = (profile.environment.themes + Theme.approved_themes(profile)).uniq_by{ |t| t.id }.sort_by{ |t| t.name }
     @current_theme = profile.theme
     @layout_templates = LayoutTemplate.all
 require 'noosfero/core_ext/string'
 require 'noosfero/core_ext/integer'
+require 'noosfero/core_ext/array'
 require 'noosfero/core_ext/object'
 require 'noosfero/core_ext/active_record'
@@ -0,0 +1,9 @@
+class Array
+
+  def uniq_by
+    hash, array = {}, []
+    each { |i| hash[yield(i)] ||= (array << i) }
+    array
+  end
+
+end
	@@ -14,7 +14,7 @@ class ThemesController < MyProfileController		@@ -14,7 +14,7 @@ class ThemesController < MyProfileController
14	end	14	end
15		15
16	def index	16	def index
17	- @themes = profile.environment.themes + Theme.approved_themes(profile)	17	+ @themes = (profile.environment.themes + Theme.approved_themes(profile)).uniq_by{ \|t\| t.id }.sort_by{ \|t\| t.name }
18	@current_theme = profile.theme	18	@current_theme = profile.theme
19		19
20	@layout_templates = LayoutTemplate.all	20	@layout_templates = LayoutTemplate.all
1	require 'noosfero/core_ext/string'	1	require 'noosfero/core_ext/string'
2	require 'noosfero/core_ext/integer'	2	require 'noosfero/core_ext/integer'
		3	+require 'noosfero/core_ext/array'
3	require 'noosfero/core_ext/object'	4	require 'noosfero/core_ext/object'
4	require 'noosfero/core_ext/active_record'	5	require 'noosfero/core_ext/active_record'
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class Array
	2	+
	3	+ def uniq_by
	4	+ hash, array = {}, []
	5	+ each { \|i\| hash[yield(i)] \|\|= (array << i) }
	6	+ array
	7	+ end
	8	+
	9	+end