diff options
| author | Herminio Torres <herminiocesar@gmail.com> | 2016-07-27 00:56:17 -0300 |
|---|---|---|
| committer | Herminio Torres <herminiocesar@gmail.com> | 2016-07-28 12:20:57 -0300 |
| commit | 94e6d51ec047fbf01cae2814003bba7ee2ff8546 (patch) | |
| tree | 6de538f4370b1735068939f82db26c3e3cc8746a /app/controllers | |
| parent | 680d361c83fcf57de2927161ddfe7c09766ae75b (diff) | |
| download | gitlab-ce-94e6d51ec047fbf01cae2814003bba7ee2ff8546.tar.gz | |
Fix the title of the toggle dropdown button
Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value.
E.g.
When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title.
Change the implementation of the `link_to` `filter_branches_path`
- Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`.
- Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 6126acccaab..e926043f3eb 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -6,6 +6,7 @@ class Projects::BranchesController < Projects::ApplicationController before_action :authorize_push_code!, only: [:new, :create, :destroy] def index + @sort = params[:sort].presence || 'name' @branches = BranchesFinder.new(@repository, params).execute @branches = Kaminari.paginate_array(@branches).page(params[:page]) |