diff options
| author | gebele <gebele@in-silico.ch> | 2011-09-26 15:04:36 +0200 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2011-09-26 15:04:36 +0200 |
| commit | e033962e2ef1a7aed3418face90a4cc276923ce0 (patch) | |
| tree | 11ce8df9a9d3e8a3d5aa5c16dd6bbfd0778e54a1 | |
| parent | 48f2c9d8824a4ffc355e11c171dadfc2885c452b (diff) | |
| parent | d1a61ff236cf95a7f3cba4a60e85c14e877c730d (diff) | |
Merge branch 'development' into feature/policy
| -rw-r--r-- | application.rb | 4 | ||||
| -rw-r--r-- | views/models_navigation.haml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/application.rb b/application.rb index d7ffa01..ba99837 100644 --- a/application.rb +++ b/application.rb @@ -1,7 +1,7 @@ ['rubygems', "haml", "sass", "rack-flash"].each do |lib| require lib end -gem "opentox-ruby", "~> 2" +gem "opentox-ruby", "~> 3" require 'opentox-ruby' gem 'sinatra-static-assets' require 'sinatra/static_assets' @@ -103,7 +103,7 @@ get '/models/?' do @models = ToxCreateModel.all.sort(:order => "#{order}") end else - params["sort_by"] = "id" + params["sort_by"] = "created_at" end @models = ToxCreateModel.all.sort(:order => "DESC") unless @models diff --git a/views/models_navigation.haml b/views/models_navigation.haml index ed8b720..0dc1f63 100644 --- a/views/models_navigation.haml +++ b/views/models_navigation.haml @@ -5,8 +5,8 @@ %input{:type => :hidden, :name => :order, :id => "order", :value => params[:order]} %input{:type => :hidden, :name => :page, :id => "page", :value => params[:page]} - Models are sorted by: - - ["id","created_at","name","type"].each do |s| + Sort by: + - ["created_at","name","type"].each do |s| - idname = s == "created_at" ? "date" : s - if params[:sort_by] == s %div{:id => idname, :class => "active"} @@ -42,7 +42,7 @@ %img{:src => "arrow_right_inactive.png", :alt => '', :title => ''}/ - js = "" - - ["id","created_at","name","type"].each do |s| + - ["created_at","name","type"].each do |s| - idname = s == "created_at" ? "date" : s - js += "$('##{idname}').click(function() \{ \n " - js += " $('#sort_by').val('#{s}');\n " |