summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-03-10 19:07:54 +0100
committerChristoph Helma <helma@in-silico.ch>2011-03-10 19:07:54 +0100
commitb73a7c1f48472919d14d6c1cdef5a48f705ae66e (patch)
tree2d30d5aba92f96809c6b004f5d8c7331300d47cc
parent78cb7eccbf7bc828c7e26adcb497d913e54d6b7c (diff)
parentd2f80eb88b75e2c45ff5d59ca42ed5fc065cefd7 (diff)
Merge branch 'master' into development
-rw-r--r--application.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/application.rb b/application.rb
index 364471a..f6e03cc 100644
--- a/application.rb
+++ b/application.rb
@@ -70,7 +70,7 @@ get '/login' do
end
get '/models/?' do
- @models = ToxCreateModel.all.to_a.reverse
+ @models = ToxCreateModel.all#.to_a.reverse
subjectstring = session[:subjectid] ? "?subjectid=#{CGI.escape(session[:subjectid])}" : ""
haml :models, :locals=>{:models=>@models, :subjectstring => subjectstring}
end
@@ -151,7 +151,7 @@ get '/model/:id/:view/?' do
end
get '/predict/?' do
- @models = ToxCreateModel.all.to_a.reverse
+ @models = ToxCreateModel.all#.to_a.reverse
@models = @models.collect{|m| m if m.status == 'Completed'}.compact
haml :predict
end