diff options
author | gebele <gebele@in-silico.ch> | 2011-08-31 12:45:19 +0200 |
---|---|---|
committer | gebele <gebele@in-silico.ch> | 2011-08-31 12:45:19 +0200 |
commit | fac3b5dde65e8bf60c37314fa8435f8f3a9ddb19 (patch) | |
tree | 4239497b512ce3dad393892a0b97f9c85320b2dd /application.rb | |
parent | e76dcca3562d9e7d2fe0b610228873087215ceed (diff) | |
parent | aeb03ab4a64353d51830d14dbd82f5d19c7254c6 (diff) |
Merge branch 'development' into feature/policy
Conflicts:
views/model.haml
views/models.haml
Diffstat (limited to 'application.rb')
-rw-r--r-- | application.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/application.rb b/application.rb index fbc1cc3..55a8eb6 100644 --- a/application.rb +++ b/application.rb @@ -91,7 +91,22 @@ get '/login' do end get '/models/?' do - @models = ToxCreateModel.all.sort(:order => "DESC") + @page = params[:page] ? params[:page].to_i : 0 + order = params["order"] == "ASC" ? "ASC" : "DESC" + params["order"] = order + sort_by = params["sort_by"] + if sort_by + case sort_by + when "name", "created_at", "type" + @models = ToxCreateModel.all.sort_by(sort_by.to_sym, :order => "#{order} ALPHA") + when "id" + @models = ToxCreateModel.all.sort(:order => "#{order}") + end + else + params["sort_by"] = "id" + end + + @models = ToxCreateModel.all.sort(:order => "DESC") unless @models @models.each{|m| raise "internal redis error: model is nil" unless m} haml :models, :locals=>{:models=>@models} end |