Implement administrator mode

[invirt/packages/invirt-web.git] / code / view.py

diff --git a/code/view.py b/code/view.py
index 5d4750d..d15d53f 100644 (file)
--- a/code/view.py
+++ b/code/view.py
@@ -29,7 +29,8 @@ class MakoLoader(object):
         self.lookups = {}
     
     def __call__(self, filename, directories, module_directory=None,
         self.lookups = {}
     
     def __call__(self, filename, directories, module_directory=None,

-                 collection_size=-1, content_type='text/html; charset=utf-8'):
+                 collection_size=-1, content_type='text/html; charset=utf-8',
+                 imports=[]):

         # Find the appropriate template lookup.
         key = (tuple(directories), module_directory)
         try:
         # Find the appropriate template lookup.
         key = (tuple(directories), module_directory)
         try:

@@ -41,6 +42,7 @@ class MakoLoader(object):
                                     default_filters=['decode.utf8'],
                                     input_encoding='utf-8',
                                     output_encoding='utf-8',
                                     default_filters=['decode.utf8'],
                                     input_encoding='utf-8',
                                     output_encoding='utf-8',

+                                    imports=imports,

                                     )
             self.lookups[key] = lookup
         cherrypy.request.lookup = lookup
                                     )
             self.lookups[key] = lookup
         cherrypy.request.lookup = lookup

@@ -80,6 +82,14 @@ def require_login():
 
 cherrypy.tools.require_login = cherrypy.Tool('on_start_resource', require_login, priority=150)
 
 
 cherrypy.tools.require_login = cherrypy.Tool('on_start_resource', require_login, priority=150)
 

+def require_POST():
+    """If the request isn't a POST request, raise 405 Method Not Allowed"""
+    if cherrypy.request.method != "POST":
+        raise cherrypy.HTTPError(405,
+                                 "You must submit this request with POST")
+
+cherrypy.tools.require_POST = cherrypy.Tool('on_start_resource', require_POST, priority=150)
+

 def remote_user_login():
     """Get the current user based on the SSL or GSSAPI environment variables"""
     environ = cherrypy.request.wsgi_environ
 def remote_user_login():
     """Get the current user based on the SSL or GSSAPI environment variables"""
     environ = cherrypy.request.wsgi_environ

@@ -102,7 +112,8 @@ cherrypy.tools.remote_user_login = cherrypy.Tool('on_start_resource', remote_use
 
 def invirtwebstate_init():
     """Initialize the cherrypy.request.state object from Invirt"""
 
 def invirtwebstate_init():
     """Initialize the cherrypy.request.state object from Invirt"""

-    cherrypy.request.state = State(cherrypy.request.login)
+    if not hasattr(cherrypy.request, "state"):
+        cherrypy.request.state = State(cherrypy.request.login)

 
 cherrypy.tools.invirtwebstate = cherrypy.Tool('on_start_resource', invirtwebstate_init, priority=100)
 
 
 cherrypy.tools.invirtwebstate = cherrypy.Tool('on_start_resource', invirtwebstate_init, priority=100)