--- a/app/soc/views/site/docs/edit.py	Thu Oct 09 23:38:27 2008 +0000
+++ b/app/soc/views/site/docs/edit.py	Thu Oct 09 23:48:20 2008 +0000
@@ -31,6 +31,7 @@
 from soc.logic import document
 from soc.logic import out_of_band
 from soc.logic import path_linkname
+from soc.logic.helper import access
 from soc.logic.site import id_user
 from soc.views import helper
 import soc.views.helper.forms
@@ -92,34 +93,15 @@
     A subclass of django.http.HttpResponse which either contains the form to
     be filled out, or a redirect to the correct view in the interface.
   """
-  # create default template context for use with any templates
+
+  try:
+    access.checkIsDeveloper(request)
+  except  soc.logic.out_of_band.AccessViolationResponse, alt_response:
+    return alt_response.response()
+
+# create default template context for use with any templates
   context = helper.responses.getUniversalContext(request)
-
   logged_in_id = users.get_current_user()
-  
-  alt_response = simple.getAltResponseIfNotDeveloper(request, context, 
-                                                     id=logged_in_id)
-  if alt_response:
-    # not a developer
-    return alt_response
-  
-  alt_response = simple.getAltResponseIfNotLoggedIn(request, context, 
-                                                    id=logged_in_id)
-  if alt_response:
-    # not logged in
-    return alt_response
-  
-  alt_response = simple.getAltResponseIfNotUser(request, context, 
-                                                id = logged_in_id)
-  if alt_response:
-    # no existing User entity for logged in Google Account. User entity is 
-    # required for creating Documents
-    return alt_response
-
-  alt_response = simple.getAltResponseIfNotDeveloper(request,
-                                                     context=context)
-  if alt_response:
-    return alt_response
 
   doc = None  # assume that no Document entity will be found
 
@@ -241,21 +223,16 @@
     A subclass of django.http.HttpResponse which either contains the form to
     be filled out, or a redirect to the correct view in the interface.
   """
+
+  try:
+    access.checkIsDeveloper(request)
+  except  soc.logic.out_of_band.AccessViolationResponse, alt_response:
+    return alt_response.response()
+
   # create default template context for use with any templates
   context = helper.responses.getUniversalContext(request)
-
   logged_in_id = users.get_current_user()
 
-  alt_response = simple.getAltResponseIfNotDeveloper(request,
-                                                     context=context,
-                                                     id=logged_in_id)
-  if alt_response:
-    return alt_response
-
-  alt_response = simple.getAltResponseIfNotDeveloper(request,
-                                                     context=context)
-  if alt_response:
-    return alt_response
   if request.method == 'POST':
     form = CreateForm(request.POST)