nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remeber sort order

Browse source
This commit is contained in:
MrZYX 2011-02-19 17:06:26 +01:00
parent 7ab287c3e1
commit aa6ac41d68
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/aspects_controller.rb
View file

@ -23,7 +23,12 @@ class AspectsController < ApplicationController
if (current_user.getting_started == true || @aspects.blank?) && !request.format.mobile? if (current_user.getting_started == true || @aspects.blank?) && !request.format.mobile?
redirect_to getting_started_path redirect_to getting_started_path
else 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} @aspect_ids = @aspects.map{|a| a.id}
@posts = StatusMessage.joins(:aspects).where(:pending => false, @posts = StatusMessage.joins(:aspects).where(:pending => false,

4
app/views/aspects/_aspect_stream.haml
View file

@ -6,9 +6,9 @@
= render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids = render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids
.prepend-11 .prepend-11
= t('.sort_by') = 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(',')}} #main_stream.stream{:data => {:guids => aspect_ids.join(',')}}
= render 'shared/stream', :posts => fakes = render 'shared/stream', :posts => fakes
%a.paginate %a.paginate