[Testbot] Plone 4.3 - Python 2.6 - Build # 1824 - Still failing! - 15 failure(s)
jenkins at plone.org
jenkins at plone.org
Wed Mar 5 11:41:38 UTC 2014
-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 1824 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-4.3-python-2.6/1824/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.portlet.collection
Branch: refs/heads/2.1.x
Date: 2014-03-05T03:03:36-08:00
Author: Anthony Gerrard () <anthonygerrard at gmail.com>
Commit: https://github.com/plone/plone.portlet.collection/commit/69f5f0b1ac58c334d0e172169a0c3a3f04e161d7
(backport) Provide a hook to facilitate overrides that do not include an empty footer when the more link is turned off.
Files changed:
M CHANGES.txt
M plone/portlet/collection/collection.pt
M plone/portlet/collection/collection.py
M setup.py
diff --git a/CHANGES.txt b/CHANGES.txt
index 0797841..2cf7ba2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,12 @@
Changelog
=========
-2.2.0 (unreleased)
+2.1.6 (unreleased)
------------------
-- Nothing changed yet.
+- (backport) Provide a hook to facilitate overrides that do not
+ include an empty footer when the more link is turned off.
+ [anthonygerrard]
2.1.5 (2013-04-29)
diff --git a/plone/portlet/collection/collection.pt b/plone/portlet/collection/collection.pt
index 9fbd3b0..abe7f19 100644
--- a/plone/portlet/collection/collection.pt
+++ b/plone/portlet/collection/collection.pt
@@ -37,9 +37,11 @@
</dd>
</tal:events>
- <dd class="portletFooter">
+ <dd class="portletFooter"
+ tal:condition="python:showMore or view.include_empty_footer()"
+ tal:define="showMore view/data/show_more">
<span class="portletBottomLeft"></span>
- <span tal:condition="view/data/show_more">
+ <span tal:condition="showMore">
<a tal:attributes="href collection_url">
<span class="hiddenStructure"><span tal:replace="view/data/header" /> - </span>
<span i18n:translate="more_url">More…</span>
diff --git a/plone/portlet/collection/collection.py b/plone/portlet/collection/collection.py
index 545e941..9f529d0 100644
--- a/plone/portlet/collection/collection.py
+++ b/plone/portlet/collection/collection.py
@@ -188,6 +188,15 @@ def collection(self):
if not sm.checkPermission('View', result):
result = None
return result
+
+ def include_empty_footer(self):
+ """
+ Whether or not to include an empty footer element when the more
+ link is turned off.
+ Always returns True (this method provides a hook for
+ sub-classes to override the default behaviour).
+ """
+ return True
class AddForm(base.AddForm):
diff --git a/setup.py b/setup.py
index b138647..c219475 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '2.2.0dev'
+version = '2.1.6dev'
setup(name='plone.portlet.collection',
version=version,
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 2695 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140305/884da3b7/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 165174 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140305/884da3b7/attachment-0003.obj>
More information about the Testbot
mailing list