added missing sql report help and converted article, file manager, sql report, and uss to use the proper pagination template vars
This commit is contained in:
parent
a850033b92
commit
ffd532dcf1
8 changed files with 78 additions and 28 deletions
|
|
@ -77,6 +77,9 @@ The hash reference to append the variables to.
|
|||
sub appendTemplateVars {
|
||||
my $self = shift;
|
||||
my $var = shift;
|
||||
$var->{'pagination.isFirstPage'} = ($self->getPageNumber == 1);
|
||||
$var->{'pagination.isLastPage'} = ($self->getPageNumber == $self->getNumberOfPages);
|
||||
$var->{'pagination.firstPage'} = $self->getFirstPageLink;
|
||||
$var->{'pagination.firstPage'} = $self->getFirstPageLink;
|
||||
$var->{'pagination.lastPage'} = $self->getLastPageLink;
|
||||
$var->{'pagination.nextPage'} = $self->getNextPageLink;
|
||||
|
|
|
|||
|
|
@ -164,14 +164,7 @@ sub www_view {
|
|||
my $p = WebGUI::Paginator->new(WebGUI::URL::page("wid=".$_[0]->get("wobjectId")."&func=view"),1);
|
||||
$p->setDataByArrayRef(\@pages);
|
||||
$var{description} = $p->getPage;
|
||||
$var{firstPage} = $p->getFirstPageLink;
|
||||
$var{lastPage} = $p->getLastPageLink;
|
||||
$var{nextPage} = $p->getNextPageLink;
|
||||
$var{pageList} = $p->getPageLinks;
|
||||
$var{previousPage} = $p->getPreviousPageLink;
|
||||
$var{multiplePages} = ($p->getNumberOfPages > 1);
|
||||
$var{isLastPage} = ($p->getNumberOfPages == $p->getPageNumber);
|
||||
$var{isFirstPage} = (1 == $p->getPageNumber);
|
||||
$p->appendTemplateVars(\%var);
|
||||
}
|
||||
if ($_[0]->get("attachment") ne "") {
|
||||
$file = WebGUI::Attachment->new($_[0]->get("attachment"),$_[0]->get("wobjectId"));
|
||||
|
|
|
|||
|
|
@ -401,12 +401,7 @@ sub www_view {
|
|||
$var{"noresults.message"} = WebGUI::International::get(19,$_[0]->get("namespace"));
|
||||
$var{noresults} = !$flag;
|
||||
$var{file_loop} = \@fileloop;
|
||||
$var{firstPage} = $p->getFirstPageLink;
|
||||
$var{lastPage} = $p->getLastPageLink;
|
||||
$var{nextPage} = $p->getNextPageLink;
|
||||
$var{pageList} = $p->getPageLinks;
|
||||
$var{previousPage} = $p->getPreviousPageLink;
|
||||
$var{multiplePages} = ($p->getNumberOfPages > 1);
|
||||
$p->appendTemplateVars(\%var);
|
||||
return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -164,14 +164,7 @@ sub www_view {
|
|||
$var{'rows.count'} = $p->getRowCount;
|
||||
$var{'rows.count.isZero'} = ($p->getRowCount < 1);
|
||||
$var{'rows.count.isZero.label'} = WebGUI::International::get(18,$_[0]->get("namespace"));
|
||||
$var{firstPage} = $p->getFirstPageLink;
|
||||
$var{lastPage} = $p->getLastPageLink;
|
||||
$var{nextPage} = $p->getNextPageLink;
|
||||
$var{pageList} = $p->getPageLinks;
|
||||
$var{previousPage} = $p->getPreviousPageLink;
|
||||
$var{multiplePages} = ($p->getNumberOfPages > 1);
|
||||
$var{numberOfPages} = $p->getNumberOfPages;
|
||||
$var{pageNumber} = $p->getPageNumber;
|
||||
$p->appendTemplateVars(\%var);
|
||||
}
|
||||
} else {
|
||||
push(@debug,{'debug.output'=>WebGUI::International::get(10,$_[0]->get("namespace"))});
|
||||
|
|
|
|||
|
|
@ -736,12 +736,7 @@ sub www_view {
|
|||
$i++;
|
||||
}
|
||||
$var{submissions_loop} = \@submission;
|
||||
$var{firstPage} = $p->getFirstPageLink;
|
||||
$var{lastPage} = $p->getLastPageLink;
|
||||
$var{nextPage} = $p->getNextPageLink;
|
||||
$var{pageList} = $p->getPageLinks;
|
||||
$var{previousPage} = $p->getPreviousPageLink;
|
||||
$var{multiplePages} = ($p->getNumberOfPages > 1);
|
||||
$p->appendTemplateVars(\%var);
|
||||
return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue