[Testbot] Plone 4.3 - Python 2.7 - Build # 2007 - Still failing! - 13 failure(s)
jenkins at plone.org
jenkins at plone.org
Tue Mar 4 17:50:55 UTC 2014
-------------------------------------------------------------------------------
Plone 4.3 - Python 2.7 - Build # 2007 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-4.3-python-2.7/2007/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.content
Branch: refs/heads/2.1.x
Date: 2014-03-04T09:02:25-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.content/commit/70a84714de8a09169fc38a50c3f4a79c4fddddbd
Allow to modify the pagesize with a query-string.
Files changed:
M CHANGES.txt
M plone/app/content/browser/folder_contents.js
M plone/app/content/browser/foldercontents.py
M plone/app/content/browser/table.pt
M plone/app/content/browser/table.txt
M plone/app/content/browser/tableview.py
diff --git a/CHANGES.txt b/CHANGES.txt
index d4ec925..ccc732f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Changelog
2.1.5 (unreleased)
------------------
-- Nothing changed yet.
+- Allow modifying the pagesize by adding a request-string e.g. "?pagesize=100".
+ [pbauer]
2.1.4 (2013-12-09)
diff --git a/plone/app/content/browser/folder_contents.js b/plone/app/content/browser/folder_contents.js
index 5f21f25..c91b2c3 100644
--- a/plone/app/content/browser/folder_contents.js
+++ b/plone/app/content/browser/folder_contents.js
@@ -6,6 +6,7 @@ function replaceFolderContentsTable(overrides) {
var defaults = {
"sort_on": fCF.find("input[name=sort_on]").first().val(),
"pagenumber": fCF.find("input[name=pagenumber]").first().val(),
+ "pagesize": fCF.find("input[name=pagesize]").first().val(),
"show_all": fCF.find("input[name=show_all]").first().val()
};
$.get('foldercontents_get_table', $.extend(defaults, overrides), function(data) {
diff --git a/plone/app/content/browser/foldercontents.py b/plone/app/content/browser/foldercontents.py
index 67b899d..5798d81 100644
--- a/plone/app/content/browser/foldercontents.py
+++ b/plone/app/content/browser/foldercontents.py
@@ -119,13 +119,14 @@ def __init__(self, context, request, contentFilter=None):
self.context = context
self.request = request
self.contentFilter = contentFilter is not None and contentFilter or {}
+ self.pagesize = int(self.request.get('pagesize', 20))
self.items = self.folderitems()
-
url = context.absolute_url()
view_url = url + '/folder_contents'
self.table = Table(request, url, view_url, self.items,
show_sort_column=self.show_sort_column,
- buttons=self.buttons)
+ buttons=self.buttons,
+ pagesize=self.pagesize)
def render(self):
return self.table.render()
@@ -158,7 +159,7 @@ def folderitems(self):
contentsMethod = self.contentsMethod()
show_all = self.request.get('show_all', '').lower() == 'true'
- pagesize = 20
+ pagesize = self.pagesize
pagenumber = int(self.request.get('pagenumber', 1))
start = (pagenumber - 1) * pagesize
end = start + pagesize
diff --git a/plone/app/content/browser/table.pt b/plone/app/content/browser/table.pt
index eb22adb..c7852b9 100644
--- a/plone/app/content/browser/table.pt
+++ b/plone/app/content/browser/table.pt
@@ -4,6 +4,7 @@
tal:attributes="value request/sort_on|string:getObjPositionInParent"
/>
<input type="hidden" name="pagenumber" tal:attributes="value view/batch/pagenumber"/>
+ <input type="hidden" name="pagesize" tal:attributes="value view/batch/pagesize"/>
<input type="hidden" name="show_all" tal:attributes="value view/show_all"/>
<input type="hidden" name="orig_template" tal:attributes="value view/viewname"/>
<tal:block condition="view/selectall">
@@ -21,7 +22,7 @@
<metal:listing define-macro="folder_listing"
tal:define="nosortclass view/get_nosort_class">
-
+
<div class="visualClear" id="clear-space-before-navigation"><!-- --></div>
<div tal:replace="structure view/batching" tal:condition="not:view/show_all"/>
@@ -38,11 +39,11 @@
<th colspan="6" class="nosort">
<span tal:omit-tag="" i18n:translate="tableheading_all_items_selected">
All <tal:block replace="view/batch/items_on_page" i18n:name="count"/> items on this
- page are selected.
+ page are selected.
</span>
- <a tal:attributes="href view/selectall_url"
+ <a tal:attributes="href view/selectall_url"
id="foldercontents-selectall-completebatch"
- i18n:translate="tableheading_select_all_items">Select all
+ i18n:translate="tableheading_select_all_items">Select all
<tal:block replace="view/batch/sequence_length" i18n:name="count"/> items in this folder.</a>
</th>
</tr>
@@ -50,7 +51,7 @@
<th colspan="6" class="nosort">
<span tal:omit-tag="" i18n:translate="tableheading_all_items_selected_in_folder">
All <tal:block replace="view/batch/sequence_length" i18n:name="count"/> items in this folder
- are selected.
+ are selected.
</span>
<a tal:attributes="href view/selectnone_url" i18n:translate="tableheading_clear_selection"
id="foldercontents-clearselection">Clear selection</a>
@@ -123,7 +124,7 @@
<input type="hidden" name="selected_obj_paths:list" value="#"
tal:attributes="value item/path|id" />
<label tal:content="title_or_id"
- tal:attributes="for string:cb_${id}"
+ tal:attributes="for string:cb_${id}"
class="hiddenStructure">
Item Title
</label>
diff --git a/plone/app/content/browser/table.txt b/plone/app/content/browser/table.txt
index ed95de5..a8edb76 100644
--- a/plone/app/content/browser/table.txt
+++ b/plone/app/content/browser/table.txt
@@ -12,7 +12,7 @@ A table can be parameterized at creation time.
>>> view_url = 'http://plone/view'
>>> base_url = 'http://plone'
>>> table = Table(request={}, base_url=base_url, view_url=view_url,
- ... items=[], show_sort_column=False, buttons=[])
+ ... items=[], show_sort_column=False, buttons=[])
The most important argument is items. This must provide a list of dictionaries
because the table will add more information to them for rendering.
@@ -116,18 +116,18 @@ The table provides the template with urls for selecting or deselecting items in
the batch. These urls are based on the url passed in at creation time.
>>> table.selectnone_url
- 'http://plone/view?pagenumber=1'
+ 'http://plone/view?pagenumber=1&pagesize=20'
You can see how it automatically adds the current page to the url.
>>> table.selectscreen_url
- 'http://plone/view?pagenumber=1&select=screen'
+ 'http://plone/view?pagenumber=1&pagesize=20&select=screen'
The same goes for selecting the screen and the whole batch.
>>> table.selectall_url
- 'http://plone/view?pagenumber=1&select=all'
-
+ 'http://plone/view?pagenumber=1&pagesize=20&select=all'
+
A template may want to display only one of these urls at the same time.
Therefore the table has a boolean property to query wheter or not to show the
select all option. The display of this depends on wheter the whole batch is
diff --git a/plone/app/content/browser/tableview.py b/plone/app/content/browser/tableview.py
index 37ba18e..1b90f16 100644
--- a/plone/app/content/browser/tableview.py
+++ b/plone/app/content/browser/tableview.py
@@ -146,7 +146,8 @@ def selectscreen_url(self):
@property
def selectnone_url(self):
- base = self.view_url + '?pagenumber=%s' % (self.pagenumber)
+ base = self.view_url + '?pagenumber=%s&pagesize=%s' % (
+ self.pagenumber, self.pagesize)
if self.show_all:
base += '&show_all=true'
return base
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 7831 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140304/1a9321cc/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 83402 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140304/1a9321cc/attachment-0003.obj>
More information about the Testbot
mailing list