diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs index e2f9f8b99a2..91644922640 100644 --- a/app/assets/javascripts/admin/templates/customize-themes.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes.hbs @@ -5,6 +5,7 @@ {{#each sortedThemes as |theme|}}
  • {{#link-to 'adminCustomizeThemes.show' theme replace=true}} + {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}} {{theme.name}} {{#if theme.user_selectable}} {{d-icon "user"}} diff --git a/app/models/theme.rb b/app/models/theme.rb index 024218ae93e..5dfcd54b3e9 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -8,6 +8,7 @@ class Theme < ActiveRecord::Base @cache = DistributedCache.new('theme') + belongs_to :user belongs_to :color_scheme has_many :theme_fields, dependent: :destroy has_many :theme_settings, dependent: :destroy diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb index 8cf183b4a8d..4938b5fac99 100644 --- a/app/serializers/theme_serializer.rb +++ b/app/serializers/theme_serializer.rb @@ -58,6 +58,8 @@ end class ThemeSerializer < ChildThemeSerializer attributes :color_scheme, :color_scheme_id, :user_selectable, :remote_theme_id, :settings + has_one :user, serializer: UserNameSerializer, embed: :object + has_many :theme_fields, serializer: ThemeFieldSerializer, embed: :objects has_many :child_themes, serializer: ChildThemeSerializer, embed: :objects has_one :remote_theme, serializer: RemoteThemeSerializer, embed: :objects