When the display limit is specified, but there less than the display limit items, then use the item count as the display limit. 2nd attempt :-/
This commit is contained in:
parent
fd55451395
commit
d02ae95866
@ -31,18 +31,16 @@ class Dynamic_Controller extends Controller {
|
|||||||
|
|
||||||
$album_defn = unserialize(module::get_var("dynamic", $album));
|
$album_defn = unserialize(module::get_var("dynamic", $album));
|
||||||
$display_limit = $album_defn->limit;
|
$display_limit = $album_defn->limit;
|
||||||
if (empty($display_limit)) {
|
$children_count = ORM::factory("item")
|
||||||
$children_count = ORM::factory("item")
|
->viewable()
|
||||||
->viewable()
|
->where("type", "!=", "album")
|
||||||
->where("type", "!=", "album")
|
->count_all();
|
||||||
->count_all();
|
if (!empty($display_limit)) {
|
||||||
} else {
|
$children_count = min($children_count, $display_limit);
|
||||||
$children_count = $display_limit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$offset = ($page-1) * $page_size;
|
$offset = ($page - 1) * $page_size;
|
||||||
|
$max_pages = max(ceil($children_count / $page_size), 1);
|
||||||
$max_pages = ceil($children_count / $page_size);
|
|
||||||
|
|
||||||
// Make sure that the page references a valid offset
|
// Make sure that the page references a valid offset
|
||||||
if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
|
if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
|
||||||
|
@ -31,18 +31,16 @@ class Dynamic_Controller extends Controller {
|
|||||||
|
|
||||||
$album_defn = unserialize(module::get_var("dynamic", $album));
|
$album_defn = unserialize(module::get_var("dynamic", $album));
|
||||||
$display_limit = $album_defn->limit;
|
$display_limit = $album_defn->limit;
|
||||||
if (empty($display_limit)) {
|
$children_count = ORM::factory("item")
|
||||||
$children_count = ORM::factory("item")
|
->viewable()
|
||||||
->viewable()
|
->where("type", "!=", "album")
|
||||||
->where("type", "!=", "album")
|
->count_all();
|
||||||
->count_all();
|
if (!empty($display_limit)) {
|
||||||
} else {
|
$children_count = min($children_count, $display_limit);
|
||||||
$children_count = $display_limit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$offset = ($page-1) * $page_size;
|
$offset = ($page - 1) * $page_size;
|
||||||
|
$max_pages = max(ceil($children_count / $page_size), 1);
|
||||||
$max_pages = ceil($children_count / $page_size);
|
|
||||||
|
|
||||||
// Make sure that the page references a valid offset
|
// Make sure that the page references a valid offset
|
||||||
if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
|
if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
|
||||||
|
Reference in New Issue
Block a user