Subsitelogoviewlet should only search for logo on subsite #99
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ation root is a subsite
raphael-s
force-pushed
the
rs-SubsiteLogoViewletOnlyOnSubsite
branch
from
dbdb9aa
to
44a0eaa
Compare
jone
suggested changes
Nov 25, 2016
| @@ -18,13 +19,15 @@ def __init__(self, context, request, view, manager=None): | |||
| def update(self): | |||
| super(SubsiteLogoViewlet, self).update() | |||
|
|
|||
| portal = self.portal_state.portal() | |||
| portal = api.portal.get_navigation_root(self.context) | |||
There was a problem hiding this comment.
I propose to rename portal to navigationroot or short navroot because a subsite is actually not the portal.
|
@jone didn't think about that. Thanks 😃 Should be fine now |
jone
approved these changes
Nov 28, 2016
maethu
reviewed
Nov 28, 2016
| portal = self.portal_state.portal() | ||
| navroot = api.portal.get_navigation_root(self.context) | ||
| is_subsite = bool(navroot.portal_type == 'ftw.subsite.Subsite') | ||
|
|
||
| self.navigation_root_url = self.portal_state.navigation_root_url() | ||
|
|
||
| subsite_logo = getattr(self.context, 'logo', None) |
There was a problem hiding this comment.
@raphael-s This does no solve the origin problem. self.context, needs to be replaces with navroot
maethu
reviewed
Nov 28, 2016
| logoName = portal.restrictedTraverse('base_properties').logoName | ||
| logo_alt_text = portal.getProperty('logo_alt_text', '') | ||
| self.logo_tag = portal.restrictedTraverse(logoName).tag( | ||
| logoName = navroot.restrictedTraverse('base_properties').logoName |
There was a problem hiding this comment.
@mbaechtold revert... this is the fallback.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes the
subsitelogoviewletonly search for a logo when the navigation root of the context actually is a subsite.This led to some really weird things happening to a site when a content with the id
logogot created. (No logo, JS not working etc).