Merge pull request #1297 from Taz17/sort-by-date

Added Sort by Date Edited feature to policies index page
openaustralia · Dec 15, 2021 · 0a54716 · 0a54716
2 parents 8d9918c + 8e3ed0e
commit 0a54716
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/app/controllers/policies_controller.rb b/app/controllers/policies_controller.rb
@@ -10,6 +10,8 @@ def index
     case @sort
     when "name"
       @policies = @policies.order(:name)
+    when "date"
+      @policies = @policies.order("updated_at DESC")
     else
       @policies = @policies.left_joins(:watches).group(:id).order("COUNT(watches.id) DESC")
       @sort = nil

diff --git a/app/views/policies/_policies_chooser.html.haml b/app/views/policies/_policies_chooser.html.haml
@@ -3,6 +3,8 @@
     %button.btn.btn-sm.btn-default.dropdown-toggle{type: "button", id: "dropdownMenu1", data: {toggle: "dropdown"}}
       - if @sort == "name"
         Sorted by Name
+      - elsif @sort == "date"
+        Sorted by Date Edited
       - elsif @sort.nil?
         Sorted by Subscribers
       %span.caret
@@ -12,3 +14,5 @@
         = link_to "Name", {sort: "name"}, title: "Sort by name", role: "menuitem", tabindex: "-1"
       %li{role: "presentation", class: "#{'disabled' if @sort.nil?}"}
         = link_to "Subscribers", {sort: nil}, title: "Sort by subscribers", role: "menuitem", tabindex: "-1"
+      %li{role: "presentation", class: "#{'disabled' if @sort == 'date'}"}
+        = link_to "Date Edited", {sort: "date"}, title: "Sort by date edited", role: "menuitem", tabindex: "-1"
diff --git a/spec/fixtures/static_pages/policies.html b/spec/fixtures/static_pages/policies.html
@@ -82,6 +82,9 @@ <h1>Policies</h1>
 <li class='disabled' role='presentation'>
 <a title="Sort by subscribers" role="menuitem" tabindex="-1" href="/policies">Subscribers</a>
 </li>
+<li class='' role='presentation'>
+<a title="Sort by date edited" role="menuitem" tabindex="-1" href="/policies?sort=date">Date Edited</a>
+</li>
 </ul>
 </div>
 </div>