[Testbot] Plone 5.0 - Python 2.7 - Build # 3422 - Still failing! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Thu Oct 23 21:04:54 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 3422 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/3422/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.portlets
Branch: refs/heads/master
Date: 2014-10-23T22:35:42+02:00
Author: Jens W. Klein (jensens) <jk at kleinundpartner.at>
Commit: https://github.com/plone/plone.app.portlets/commit/3c725daf1d99b377e119953e2311810579941503
Revert "Add field to show nodes excluded from Navigation"
Files changed:
M plone/app/portlets/portlets/navigation.py
diff --git a/plone/app/portlets/portlets/navigation.py b/plone/app/portlets/portlets/navigation.py
index 825e6bd..178137d 100644
--- a/plone/app/portlets/portlets/navigation.py
+++ b/plone/app/portlets/portlets/navigation.py
@@ -92,16 +92,6 @@ class INavigationPortlet(IPortletDataProvider):
default=0,
required=False)
- showExcludedFromNav = schema.Bool(
- title=_(u"label_show_excluded_from_nav",
- default=u"Show nodes excluded from navigation."),
- description=_(u"help_excluded_from_nav",
- default=u"If selected, the navigation tree will "
- "also show nodes excluded "
- "from navigation."),
- default=False,
- required=False)
-
class Assignment(base.Assignment):
implements(INavigationPortlet)
@@ -113,16 +103,14 @@ class Assignment(base.Assignment):
includeTop = False
topLevel = 1
bottomLevel = 0
- showExcludedFromNav = False
- def __init__(self, name="", root_uid=None, currentFolderOnly=False, includeTop=False, topLevel=1, bottomLevel=0, showExcludedFromNav=False):
+ def __init__(self, name="", root_uid=None, currentFolderOnly=False, includeTop=False, topLevel=1, bottomLevel=0):
self.name = name
self.root_uid = root_uid
self.currentFolderOnly = currentFolderOnly
self.includeTop = includeTop
self.topLevel = topLevel
self.bottomLevel = bottomLevel
- self.showExcludedFromNav = showExcludedFromNav
@property
def title(self):
@@ -307,8 +295,7 @@ def create(self, data):
currentFolderOnly=data.get('currentFolderOnly', False),
includeTop=data.get('includeTop', False),
topLevel=data.get('topLevel', 0),
- bottomLevel=data.get('bottomLevel', 0),
- showExcludedFromNav=data.get('showExcludedFromNav', False))
+ bottomLevel=data.get('bottomLevel', 0))
class EditForm(base.EditForm):
@@ -403,7 +390,6 @@ def __init__(self, context, portlet):
topLevel = portlet.topLevel or navtree_properties.getProperty('topLevel', 0)
self.rootPath = getRootPath(context, currentFolderOnly, topLevel, portlet.root_uid)
- self.showExcludedFromNav = portlet.showExcludedFromNav
def subtreeFilter(self, node):
sitemapDecision = SitemapNavtreeStrategy.subtreeFilter(self, node)
@@ -415,16 +401,6 @@ def subtreeFilter(self, node):
else:
return True
- def nodeFilter(self, node):
- item = node['item']
- if getattr(item, 'getId', None) in self.excludedIds:
- return False
- elif self.showExcludedFromNav:
- return True
- elif getattr(item, 'exclude_from_nav', False):
- return False
- else:
- return True
def getRootPath(context, currentFolderOnly, topLevel, root):
"""Helper function to calculate the real root path
Repository: plone.app.portlets
Branch: refs/heads/master
Date: 2014-10-23T22:36:01+02:00
Author: Jens W. Klein (jensens) <jk at kleinundpartner.at>
Commit: https://github.com/plone/plone.app.portlets/commit/ddb7fce0e2c278c50493766280c0b5bc7ad33d8f
Merge pull request #41 from plone/revert-38-master
Revert "Add field to show nodes excluded from Navigation"
Files changed:
M plone/app/portlets/portlets/navigation.py
diff --git a/plone/app/portlets/portlets/navigation.py b/plone/app/portlets/portlets/navigation.py
index 825e6bd..178137d 100644
--- a/plone/app/portlets/portlets/navigation.py
+++ b/plone/app/portlets/portlets/navigation.py
@@ -92,16 +92,6 @@ class INavigationPortlet(IPortletDataProvider):
default=0,
required=False)
- showExcludedFromNav = schema.Bool(
- title=_(u"label_show_excluded_from_nav",
- default=u"Show nodes excluded from navigation."),
- description=_(u"help_excluded_from_nav",
- default=u"If selected, the navigation tree will "
- "also show nodes excluded "
- "from navigation."),
- default=False,
- required=False)
-
class Assignment(base.Assignment):
implements(INavigationPortlet)
@@ -113,16 +103,14 @@ class Assignment(base.Assignment):
includeTop = False
topLevel = 1
bottomLevel = 0
- showExcludedFromNav = False
- def __init__(self, name="", root_uid=None, currentFolderOnly=False, includeTop=False, topLevel=1, bottomLevel=0, showExcludedFromNav=False):
+ def __init__(self, name="", root_uid=None, currentFolderOnly=False, includeTop=False, topLevel=1, bottomLevel=0):
self.name = name
self.root_uid = root_uid
self.currentFolderOnly = currentFolderOnly
self.includeTop = includeTop
self.topLevel = topLevel
self.bottomLevel = bottomLevel
- self.showExcludedFromNav = showExcludedFromNav
@property
def title(self):
@@ -307,8 +295,7 @@ def create(self, data):
currentFolderOnly=data.get('currentFolderOnly', False),
includeTop=data.get('includeTop', False),
topLevel=data.get('topLevel', 0),
- bottomLevel=data.get('bottomLevel', 0),
- showExcludedFromNav=data.get('showExcludedFromNav', False))
+ bottomLevel=data.get('bottomLevel', 0))
class EditForm(base.EditForm):
@@ -403,7 +390,6 @@ def __init__(self, context, portlet):
topLevel = portlet.topLevel or navtree_properties.getProperty('topLevel', 0)
self.rootPath = getRootPath(context, currentFolderOnly, topLevel, portlet.root_uid)
- self.showExcludedFromNav = portlet.showExcludedFromNav
def subtreeFilter(self, node):
sitemapDecision = SitemapNavtreeStrategy.subtreeFilter(self, node)
@@ -415,16 +401,6 @@ def subtreeFilter(self, node):
else:
return True
- def nodeFilter(self, node):
- item = node['item']
- if getattr(item, 'getId', None) in self.excludedIds:
- return False
- elif self.showExcludedFromNav:
- return True
- elif getattr(item, 'exclude_from_nav', False):
- return False
- else:
- return True
def getRootPath(context, currentFolderOnly, topLevel, root):
"""Helper function to calculate the real root path
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 7022 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20141023/b38834c1/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 412295 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20141023/b38834c1/attachment-0003.obj>
More information about the Testbot
mailing list