aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-06 15:53:57 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-06 15:53:57 +0000
commit86949150acbf6607d4c13eddf69e8a4aace0b7ba (patch)
tree0b71370f7c644a824807c4659ee4bddcd568fb90
parent891090e50ee0ecb5657c61ed2e8865a2adbfc531 (diff)
downloadelgg-86949150acbf6607d4c13eddf69e8a4aace0b7ba.tar.gz
elgg-86949150acbf6607d4c13eddf69e8a4aace0b7ba.tar.bz2
You can now remove pagination from a list
git-svn-id: https://code.elgg.org/elgg/trunk@2192 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php3
-rw-r--r--engine/lib/entities.php7
-rw-r--r--engine/lib/metadata.php13
-rw-r--r--views/default/search/entity_list.php6
4 files changed, 18 insertions, 11 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 2ccf87154..14a2e4a25 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -479,7 +479,7 @@
* @param true|false $viewtypetoggle Whether or not to allow users to toggle to gallery view
* @return string The list of entities
*/
- function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = true) {
+ function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = true, $pagination = true) {
$count = (int) $count;
$offset = (int) $offset;
@@ -497,6 +497,7 @@
'context' => $context,
'viewtypetoggle' => $viewtypetoggle,
'viewtype' => get_input('search_viewtype','list'),
+ 'pagination' => $pagination
));
return $html;
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index b6a8f916a..5f01613d5 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1435,16 +1435,17 @@
* @param int $owner_guid The GUID of the owning user
* @param int $limit The number of entities to display per page (default: 10)
* @param true|false $fullview Whether or not to display the full view (default: true)
- * @param true|false $viewtypetoggle Whether or not to allow gallery view
+ * @param true|false $viewtypetoggle Whether or not to allow gallery view
+ * @param true|false $pagination Display pagination? Default: true
* @return string A viewable list of entities
*/
- function list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false) {
+ function list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false, $navigation = true) {
$offset = (int) get_input('offset');
$count = get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
$entities = get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
- return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle);
+ return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $navigation);
}
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 053e6e273..4c2685296 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -547,18 +547,19 @@
* @param string $entity_subtype The subtype of the entity
* @param int $limit Number of entities to display per page
* @param true|false $fullview Whether or not to display the full view (default: true)
- * @param true|false $viewtypetoggle Whether or not to allow users to toggle to the gallery view
+ * @param true|false $viewtypetoggle Whether or not to allow users to toggle to the gallery view. Default: true
+ * @param true|false $pagination Display pagination? Default: true
*
* @return string A list of entities suitable for display
*/
- function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = true) {
+ function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = true, $pagination = true) {
$offset = (int) get_input('offset');
$limit = (int) $limit;
$count = get_entities_from_metadata($meta_name, $meta_value, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", 0, true);
$entities = get_entities_from_metadata($meta_name, $meta_value, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", 0, false);
- return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle);
+ return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
}
@@ -656,16 +657,18 @@
* @param int $offset
* @param string $order_by Optional ordering.
* @param true|false $fullview Whether or not to display the full view (default: true)
+ * @param true|false $viewtypetoggle Whether or not to allow users to toggle to the gallery view. Default: true
+ * @param true|false $pagination Display pagination? Default: true
* @return string List of ElggEntities suitable for display
*/
- function list_entities_from_metadata_multi($meta_array, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true) {
+ function list_entities_from_metadata_multi($meta_array, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = true, $pagination = true) {
$offset = (int) get_input('offset');
$limit = (int) $limit;
$count = get_entities_from_metadata_multi($meta_array, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", $site_guid, true);
$entities = get_entities_from_metadata_multi($meta_array, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", $site_guid, false);
- return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview);
+ return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
}
diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php
index 8ceb0b139..a298983a2 100644
--- a/views/default/search/entity_list.php
+++ b/views/default/search/entity_list.php
@@ -7,7 +7,8 @@
$count = $vars['count'];
$baseurl = $vars['baseurl'];
$context = $vars['context'];
- $viewtype = $vars['viewtype'];
+ $viewtype = $vars['viewtype'];
+ $pagination = $vars['pagination'];
$html = "";
$nav = "";
@@ -29,7 +30,8 @@
));
}
- $nav .= elgg_view('navigation/pagination',array(
+ if ($pagination)
+ $nav .= elgg_view('navigation/pagination',array(
'baseurl' => $baseurl,
'offset' => $offset,