reinstate the original messages mode in addition to the new popup-based one

[myslice.git] / myslice / viewutils.py

diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index cb1b31b..eaa2dcb 100644 (file)
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -1,9 +1,5 @@
 # a set of utilities to help make the global layout consistent across views
 
-from django.http                     import HttpResponseRedirect
-
-from manifold.manifoldresult         import ManifoldException
-
 def topmenu_items (current,request=None):
     has_user=request.user.is_authenticated()
     result=[]
@@ -27,36 +23,9 @@ def topmenu_items (current,request=None):
     return result
 
 def the_user (request):
-    "This code below is broken"
+    "retrieves logged in user's email, or empty string"
     if not request.user.is_authenticated (): 
-#        print 'void user!'
         return ''
     else: 
         return request.user.email
 
-
-# a decorator for view classes to catch manifold exceptions
-# by design views should not directly exercise a manifold query
-# given that these are asynchroneous, you would expect a view to just 
-# return a mundane skeleton
-# however of course this is not always true, and if only for metadata 
-# that for some reason we deal with some other way, it is often a good idea
-# for a view to monitor these exceptions - and to take this opportunity to 
-# logout people if it's a matter of expired session for example
-def logout_on_manifold_exception (view_as_a_function):
-    def wrapped (request, *args, **kwds):
-        try:
-            return view_as_a_function(request,*args, **kwds)
-        except ManifoldException, manifold_result:
-            # xxx we need a means to display this message to user...
-            from django.contrib.auth import logout
-            logout(request)
-            return HttpResponseRedirect ('/')
-        except Exception, e:
-            # xxx we need to sugarcoat this error message in some error template...
-            print "Unexpected exception",e
-            import traceback
-            traceback.print_exc()
-            return HttpResponseRedirect ('/')
-    return wrapped
-