Merge branch 'release/v3.0.0'

1 files changed, 25 insertions, 31 deletions

diff --git a/helper.rb b/helper.rb
index 698fd3e..9b47142 100644
--- a/helper.rb
+++ b/helper.rb
@@ -1,35 +1,5 @@
 helpers do
 
-  def login(username, password)
-    logout
-    session[:subjectid] = OpenTox::Authorization.authenticate(username, password)
-    #LOGGER.debug "ToxCreate login user #{username} with subjectid: " + session[:subjectid].to_s
-    if session[:subjectid] != nil
-      session[:username] = username
-      return true
-    else
-      session[:username] = ""
-      return false
-    end
-  end
-
-  def logout
-    if session[:subjectid] != nil
-      session[:subjectid] = nil
-      session[:username] = ""
-      return true
-    end
-    return false
-  end
-
-  def logged_in()
-    return true if !AA_SERVER
-    if session[:subjectid] != nil
-      return OpenTox::Authorization.is_token_valid(session[:subjectid])
-    end
-    return false
-  end
-
   def is_authorized(uri, action)
     if OpenTox::Authorization.server && session[:subjectid] != nil
       return OpenTox::Authorization.authorized?(uri, action, session[:subjectid])
@@ -121,5 +91,29 @@ helpers do
     haml :neighbors_navigation, :layout => false
   end
 
-end
+  def models_navigation
+    @page = 0 unless @page
+    haml :models_navigation, :layout => false
+  end
 
+  def endpoint_option_list(max_time=3600)
+    out = ""
+    tmpfile = File.join(TMP_DIR, "endpoint_option_list")
+    if File.exists? tmpfile
+      if Time.now-File.mtime(tmpfile) <= max_time
+        f = File.open(tmpfile, 'r+')
+        f.each{|line| out << line}
+        return out
+      else
+        File.unlink(tmpfile)
+      end
+    end
+    result = OpenTox::Ontology::Echa.endpoint_option_list()
+    if result.lines.count > 3
+      f = File.new(tmpfile,"w")
+      f.print result
+      f.close
+    end
+    return result
+  end
+end