From c410c0b8ef345b4e8d1daf7fa0c7f4b0670e2107 Mon Sep 17 00:00:00 2001 From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com> Date: Fri, 12 Jul 2019 16:34:47 -0400 Subject: [PATCH] Change default recording sort order to descending (#630) --- app/models/concerns/api_concern.rb | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/models/concerns/api_concern.rb b/app/models/concerns/api_concern.rb index dd766d25..2b25f586 100644 --- a/app/models/concerns/api_concern.rb +++ b/app/models/concerns/api_concern.rb @@ -23,7 +23,7 @@ module APIConcern def format_recordings(api_res, search_params, ret_search_params) search = search_params[:search] || "" order_col = search_params[:column] && search_params[:direction] != "none" ? search_params[:column] : "end_time" - order_dir = search_params[:column] && search_params[:direction] != "none" ? search_params[:direction] : "asc" + order_dir = search_params[:column] && search_params[:direction] != "none" ? search_params[:direction] : "desc" search = search.downcase @@ -66,26 +66,26 @@ module APIConcern def sort_recordings(recs, order_col, order_dir) recs = case order_col when "end_time" - recs.sort_by { |r| r[:endTime] } + recs.sort_by { |r| r[:endTime] } when "name" - recs.sort_by do |r| - if !r[:metadata].nil? && !r[:metadata][:name].nil? - r[:metadata][:name].downcase - else - r[:name].downcase - end - end + recs.sort_by do |r| + if !r[:metadata].nil? && !r[:metadata][:name].nil? + r[:metadata][:name].downcase + else + r[:name].downcase + end + end when "length" - recs.sort_by { |r| r[:playbacks].reject { |p| p[:type] == "statistics" }.first[:length] } + recs.sort_by { |r| r[:playbacks].reject { |p| p[:type] == "statistics" }.first[:length] } when "users" - recs.sort_by { |r| r[:participants] } + recs.sort_by { |r| r[:participants] } when "visibility" - recs.sort_by { |r| r[:metadata][:"gl-listed"] } + recs.sort_by { |r| r[:metadata][:"gl-listed"] } when "formats" - recs.sort_by { |r| r[:playbacks].first[:type].downcase } - else - recs.sort_by { |r| r[:endTime] } - end + recs.sort_by { |r| r[:playbacks].first[:type].downcase } + else + recs.sort_by { |r| r[:endTime] } + end if order_dir == 'asc' recs