diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 19:58:57 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 00:14:58 -0500 |
| commit | 40e1ad90526ad35e1d5eba74c0b1d99b6a8ae89d (patch) | |
| tree | 37e804921763937e38f6a80fd87b671b68778034 | |
| parent | af501845dd719c2478a3c5f1bb8ead1f4b6c90b4 (diff) | |
| download | gitlab-ce-40e1ad90526ad35e1d5eba74c0b1d99b6a8ae89d.tar.gz | |
Add ability to sort forks. #2406
| -rw-r--r-- | app/controllers/projects/forks_controller.rb | 2 | ||||
| -rw-r--r-- | 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 |