From 40e1ad90526ad35e1d5eba74c0b1d99b6a8ae89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 14 Jan 2016 19:58:57 -0500
Subject: [PATCH] Add ability to sort forks. #2406
---
app/controllers/projects/forks_controller.rb | 2 ++
app/views/projects/forks/index.html.haml | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index bcb64479cbf..f6fabba26f9 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@@ -5,6 +5,8 @@ class Projects::ForksController < Projects::ApplicationController
def index
@all_forks = project.forks.includes(:creator)
+ @all_forks = @all_forks.sort(params[:sort]) if params[:sort]
+
@public_forks, @protected_forks = @all_forks.partition do |project|
can?(current_user, :read_project, project)
end
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index 24efc7b3097..10ab5c44af1 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -20,13 +20,14 @@
%b.caret
%ul.dropdown-menu.dropdown-menu-align-right
%li
- = link_to page_filter_path(sort: sort_value_recently_created) do
+ - excluded_filters = [:state, :scope, :label_name, :milestone_id, :assignee_id, :author_id]
+ = link_to page_filter_path(sort: sort_value_recently_created, without: excluded_filters) do
= sort_title_recently_created
- = link_to page_filter_path(sort: sort_value_oldest_created) do
+ = link_to page_filter_path(sort: sort_value_oldest_created, without: excluded_filters) do
= sort_title_oldest_created
- = link_to page_filter_path(sort: sort_value_recently_updated) do
+ = link_to page_filter_path(sort: sort_value_recently_updated, without: excluded_filters) do
= sort_title_recently_updated
- = link_to page_filter_path(sort: sort_value_oldest_updated) do
+ = link_to page_filter_path(sort: sort_value_oldest_updated, without: excluded_filters) do
= sort_title_oldest_updated
.fork_link.inline
--
GitLab