Merge branch 'hotfix/v1.0.1'

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
diff --git a/model.rb b/model.rb
index 7d22a4d..7b91bab 100644
--- a/model.rb
+++ b/model.rb
@@ -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