diff -r 673b2766024e -r ab71cf8bff55 Controller/WikiTagController.php --- a/Controller/WikiTagController.php Wed Oct 26 15:38:05 2011 +0200 +++ b/Controller/WikiTagController.php Wed Oct 26 16:02:46 2011 +0200 @@ -26,6 +26,7 @@ class WikiTagController extends Controller { private static $SEARCH_STAR_CHARACTER = "*"; + private static $ROUTE_FOR_DOCUMENTS_BY_TAG = "company_other"; /** * Fake index action @@ -464,7 +465,7 @@ return $this->render('WikiTagBundle:WikiTag:TagList.html.twig', array('tags' => $tags, 'searched' => $searched, 'search_def' => $search_def, 'nb_by_page' => $nb_by_page, 'sort' => $sort, 'start_index' => $start_index, 'end_index' => $end_index, 'nb_total' => $nb_total, 'num_page' => $num_page, 'last_page' => $last_page, - 'prev_page' => $prev_page, 'next_page' => $next_page, 'reverse_sort' => $reverse_sort)); + 'prev_page' => $prev_page, 'next_page' => $next_page, 'reverse_sort' => $reverse_sort, 'route_for_documents_by_tag' => WikiTagController::$ROUTE_FOR_DOCUMENTS_BY_TAG)); } @@ -484,7 +485,8 @@ $reverse_sort = $ar[5]; return $this->render('WikiTagBundle:WikiTag:TagListTable.html.twig', - array('tags' => $tags, 'searched' => $searched, 'nb_by_page' => $nb_by_page, 'sort' => $sort, 'num_page' => $num_page, 'reverse_sort' => $reverse_sort)); + array('tags' => $tags, 'searched' => $searched, 'nb_by_page' => $nb_by_page, 'sort' => $sort, 'num_page' => $num_page, + 'reverse_sort' => $reverse_sort, 'route_for_documents_by_tag' => WikiTagController::$ROUTE_FOR_DOCUMENTS_BY_TAG)); return $this->getAllTags(); } @@ -561,6 +563,7 @@ $nb_total = $pagerfanta->getNbResults(); $tags = $pagerfanta->getCurrentPageResults(); $pagerfanta->haveToPaginate(); // whether the number of results if higher than the max per page + return array($tags, $num_page, $nb_by_page, $searched, $sort, $reverse_sort, $pagerfanta); }