diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-10 19:00:52 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-10 19:00:52 +0100 |
commit | 127e6a37b27f5476be974f3092049870ae7ddd0e (patch) | |
tree | 6080aa47f8b5379e46df6699e3f5d98ed282dd2b | |
parent | d2f9102fc9394c26d4a3354f31784f3013b53ccf (diff) | |
parent | cb87e305c2dd254a15aed4133d089ad295e04919 (diff) |
Merge branch 'hotfix/v1.0.1'
-rw-r--r-- | application.rb | 4 | ||||
-rw-r--r-- | model.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/application.rb b/application.rb index 1771661..364471a 100644 --- a/application.rb +++ b/application.rb @@ -70,7 +70,7 @@ get '/login' do end get '/models/?' do - @models = ToxCreateModel.all.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.reverse + @models = ToxCreateModel.all.to_a.reverse @models = @models.collect{|m| m if m.status == 'Completed'}.compact haml :predict end @@ -87,7 +87,6 @@ def status #end end =end -=begin def validation_status begin @@ -137,6 +136,7 @@ def status end end +=begin def process LOGGER.debug self.to_yaml |