diff options
| author | mr <mr@mrautenberg.de> | 2011-10-11 12:40:21 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-10-11 12:40:21 +0200 |
| commit | ab78958d59f7d7d2526ea7a9e997f9afd2a61cc0 (patch) | |
| tree | e5cac1aaebe510cb375b06f85717643ff6dd92eb | |
| parent | 75228f3d37bc5120943569213c6364269d008cb5 (diff) | |
| parent | d1a61ff236cf95a7f3cba4a60e85c14e877c730d (diff) | |
Merge remote branch 'origin/development' into feature/endpointassignment
| -rw-r--r-- | application.rb | 2 | ||||
| -rw-r--r-- | views/models_navigation.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application.rb b/application.rb index 50aee72..c41f072 100644 --- a/application.rb +++ b/application.rb @@ -102,7 +102,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 " |