Download as
Browse Code »

Commit 27ef9853f4822acef608a2908feb895e90fea4bb

Authored by Braulio Bhavamitra
1 parent 895776ac
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

Don't duplicate themes

Showing 3 changed files with 11 additions and 1 deletions   Show diff stats
app/controllers/my_profile/themes_controller.rb
  Diff comments   View file @27ef985
... ... @@ -14,7 +14,7 @@ class ThemesController < MyProfileController
14 14 end
15 15  
16 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 }
18 18 @current_theme = profile.theme
19 19  
20 20 @layout_templates = LayoutTemplate.all
... ...
lib/noosfero/core_ext.rb
  Diff comments   View file @27ef985
1 1 require 'noosfero/core_ext/string'
2 2 require 'noosfero/core_ext/integer'
  3 +require 'noosfero/core_ext/array'
3 4 require 'noosfero/core_ext/object'
4 5 require 'noosfero/core_ext/active_record'
... ...
lib/noosfero/core_ext/array.rb 0 → 100644
  Diff comments   View file @27ef985
... ... @@ -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
... ...