[#2301] Check that the session has a sort before trying to access it.
This commit is contained in:
1 parent
328cd3fc3f
commit
71ab0c6b54
1 file changed
+2
-2
@@ -138,7 +138,7 @@ class DeliverablesController < ApplicationController
|
|||||||
|
|
||||||
# Sorting orders
|
# Sorting orders
|
||||||
def sort_order
|
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 { }
|
return { }
|
||||||
else
|
else
|
||||||
return { :order => sort_clause }
|
return { :order => sort_clause }
|
||||||
@@ -147,7 +147,7 @@ class DeliverablesController < ApplicationController
|
|||||||
|
|
||||||
# Sort +deliverables+ manually using the virtual fields
|
# Sort +deliverables+ manually using the virtual fields
|
||||||
def sort_if_needed(deliverables)
|
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]
|
case session[@sort_name][:key]
|
||||||
when "score":
|
when "score":
|
||||||
sorted = deliverables.sort {|a,b| a.score <=> b.score}
|
sorted = deliverables.sort {|a,b| a.score <=> b.score}
|
||||||
|
|||||||
Reference in new issue
Block a user