From 866b58a54e95415ad74b8f004db40abb4343c753 Mon Sep 17 00:00:00 2001 From: Igor Date: Thu, 4 Apr 2019 16:28:56 +0000 Subject: Allow to sort wiki pages by date and title - Add controls for sorting by title and date - Execute Gitaly call which now accepts sorting params for wikis --- app/controllers/projects/wikis_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index da2420633ef..88910c91763 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -16,7 +16,10 @@ class Projects::WikisController < Projects::ApplicationController end def pages - @wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page]) + @wiki_pages = Kaminari.paginate_array( + @project_wiki.pages(sort: params[:sort], direction: params[:direction]) + ).page(params[:page]) + @wiki_entries = WikiPage.group_by_directory(@wiki_pages) end -- cgit v1.2.1