mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-24 05:38:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ensured page footer on list short URLs is not displayed when printing all URLs

Browse source
This commit is contained in:
Alejandro Celaya 2020-07-14 13:14:53 +02:00
parent 3ff9e101a8
commit 8e84b0e8ac
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
View file

@ -110,7 +110,6 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
$orderBy = $this->processOrderBy($input); $orderBy = $this->processOrderBy($input);
$data = [ $data = [
ShortUrlsParamsInputFilter::PAGE => $page,
ShortUrlsParamsInputFilter::SEARCH_TERM => $searchTerm, ShortUrlsParamsInputFilter::SEARCH_TERM => $searchTerm,
ShortUrlsParamsInputFilter::TAGS => $tags, ShortUrlsParamsInputFilter::TAGS => $tags,
ShortUrlsOrdering::ORDER_BY => $orderBy, ShortUrlsOrdering::ORDER_BY => $orderBy,
@ -123,7 +122,8 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
} }
do { do {
$result = $this->renderPage($output, $showTags, ShortUrlsParams::fromRawData($data)); $data[ShortUrlsParamsInputFilter::PAGE] = $page;
$result = $this->renderPage($output, $showTags, ShortUrlsParams::fromRawData($data), $all);
$page++; $page++;
$continue = ! $this->isLastPage($result) && $io->confirm( $continue = ! $this->isLastPage($result) && $io->confirm(
@ -138,7 +138,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
return ExitCodes::EXIT_SUCCESS; return ExitCodes::EXIT_SUCCESS;
} }
private function renderPage(OutputInterface $output, bool $showTags, ShortUrlsParams $params): Paginator private function renderPage(OutputInterface $output, bool $showTags, ShortUrlsParams $params, bool $all): Paginator
{ {
$result = $this->shortUrlService->listShortUrls($params); $result = $this->shortUrlService->listShortUrls($params);
@ -159,7 +159,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
$rows[] = array_values(array_intersect_key($shortUrl, array_flip(self::COLUMNS_WHITELIST))); $rows[] = array_values(array_intersect_key($shortUrl, array_flip(self::COLUMNS_WHITELIST)));
} }
ShlinkTable::fromOutput($output)->render($headers, $rows, $this->formatCurrentPageMessage( ShlinkTable::fromOutput($output)->render($headers, $rows, $all ? null : $this->formatCurrentPageMessage(
$result, $result,
'Page %s of %s', 'Page %s of %s',
)); ));