From 71ab0c6b54fd6fb99b1afd4aacaab85e76afd470 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 1 Apr 2009 08:43:37 -0700 Subject: [PATCH] [#2301] Check that the session has a sort before trying to access it. --- app/controllers/deliverables_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 2d0e799..820ffa2 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -138,7 +138,7 @@ class DeliverablesController < ApplicationController # Sorting orders def sort_order - if %w(score spent progress labor_budget).include?(session[@sort_name][:key]) + if session[@sort_name] && %w(score spent progress labor_budget).include?(session[@sort_name][:key]) return { } else return { :order => sort_clause } @@ -147,7 +147,7 @@ class DeliverablesController < ApplicationController # Sort +deliverables+ manually using the virtual fields def sort_if_needed(deliverables) - if %w(score spent progress labor_budget).include?(session[@sort_name][:key]) + if session[@sort_name] && %w(score spent progress labor_budget).include?(session[@sort_name][:key]) case session[@sort_name][:key] when "score": sorted = deliverables.sort {|a,b| a.score <=> b.score}