From aa6ac41d68eb52a12a20616199a18dfa330904e7 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 19 Feb 2011 17:06:26 +0100
Subject: [PATCH] remeber sort order

---
 app/controllers/aspects_controller.rb | 7 ++++++-
 app/views/aspects/_aspect_stream.haml | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 698afe8f7..aca064f60 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -23,7 +23,12 @@ class AspectsController < ApplicationController
     if (current_user.getting_started == true || @aspects.blank?) && !request.format.mobile?
       redirect_to getting_started_path
     else
-      sort_order = params[:created_at].blank? ? 'updated_at' : 'created_at'
+      if params[:sort_order].blank? and session[:sort_order].blank?
+         session[:sort_order] = 'updated_at'
+      elsif not params[:sort_order].blank? and not session[:sort_order] == params[:sort_order]
+        session[:sort_order] = params[:sort_order] == 'created_at' ? 'created_at' : 'updated_at'
+      end
+      sort_order = session[:sort_order] == 'created_at' ? 'created_at' : 'updated_at'
       @aspect_ids = @aspects.map{|a| a.id}
 
       @posts = StatusMessage.joins(:aspects).where(:pending => false,
diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 8c1a2697d..60c62e97e 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -6,9 +6,9 @@
 = render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids
 .prepend-11
   = t('.sort_by')
-  = link_to_if(params[:created_at], t('.activity'), aspects_path(:a_ids => params[:a_ids])) 
+  = link_to_if(session[:sort_order] == 'created_at', t('.activity'), aspects_path(:a_ids => params[:a_ids], :sort_order => 'updated_at')) 
   |
-  = link_to_unless(params[:created_at], t('.post_time'), aspects_path(:a_ids => params[:a_ids], :created_at => true ))
+  = link_to_if(session[:sort_order] == 'updated_at', t('.post_time'), aspects_path(:a_ids => params[:a_ids], :sort_order => 'created_at' ))
 #main_stream.stream{:data => {:guids => aspect_ids.join(',')}}
   = render 'shared/stream', :posts => fakes
   %a.paginate