Improve sorting for public projects page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

diff --git a/app/controllers/public/projects_controller.rb b/app/controllers/public/projects_controller.rb
index 34425db..e00cd8c 100644 (file)
--- a/app/controllers/public/projects_controller.rb
+++ b/app/controllers/public/projects_controller.rb
@@ -8,7 +8,8 @@ class Public::ProjectsController < ApplicationController
   def index
     @projects = Project.public_or_internal_only(current_user)
     @projects = @projects.search(params[:search]) if params[:search].present?
-    @projects = case params[:sort]
+    @sort = params[:sort]
+    @projects = case @sort
                 when 'newest' then @projects.order('created_at DESC')
                 when 'oldest' then @projects.order('created_at ASC')
                 when 'recently_updated' then @projects.order('updated_at DESC')

diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index 193d5c0..002ffa9 100644 (file)
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -15,12 +15,14 @@
       %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
         %span.light sort:
         - if @sort.present?
-          = @sort
+          = @sort.humanize
         - else
-          Newest
+          Name
         %b.caret
       %ul.dropdown-menu
         %li
+          = link_to public_projects_path(sort: nil) do
+            Name
           = link_to public_projects_path(sort: 'newest') do
             Newest
           = link_to public_projects_path(sort: 'oldest') do