Download as
Browse Code »

Commit 7e2cd9cfad13231f35f5d1a5ac83ec274ca8ccd8

Authored by Victor Costa
1 parent ea9869bc
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fix display content plugin to use with container block 

Display content plugin should reference owner using block owner method.
Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
plugins/display_content/lib/display_content_block.rb
  Diff comments   View file @7e2cd9c
... ... @@ -68,12 +68,12 @@ class DisplayContentBlock < Block
68 68 protected
69 69  
70 70 def holder
71   - return nil if self.box.nil? || self.box.owner.nil?
72   - if self.box.owner.kind_of?(Environment)
73   - return nil if self.box.owner.portal_community.nil?
74   - self.box.owner.portal_community
  71 + return nil if self.box.nil? || self.owner.nil?
  72 + if self.owner.kind_of?(Environment)
  73 + return nil if self.owner.portal_community.nil?
  74 + self.owner.portal_community
75 75 else
76   - self.box.owner
  76 + self.owner
77 77 end
78 78 end
79 79  
... ...