further refoctor default render userManagement

userManagment/views.py

@@ -7,7 +7,6 @@ from loginSystem.views import loadLoginPage
 from loginSystem.models import Administrator, ACL
 import json
 from plogical import hashPassword
-from plogical import CyberCPLogFileWriter as logging
 from plogical.acl import ACLManager
 from plogical.httpProc import httpProc
 from plogical.virtualHostUtilities import virtualHostUtilities
@@ -17,30 +16,22 @@ from CyberCP.SecurityLevel import SecurityLevel
 # Create your views here.
 
 def loadUserHome(request):
-    try:
+
     val = request.session['userID']
-        try:
     admin = Administrator.objects.get(pk=val)
     currentACL = ACLManager.loadedACL(val)
+
     if currentACL['admin'] == 1:
         listUsers = 1
     else:
         listUsers = currentACL['listUsers']
 
     proc = httpProc(request, 'userManagment/index.html',
-                            {"type": admin.type, 'listUsers': listUsers}, 'admin')
+                    {"type": admin.type, 'listUsers': listUsers}, 'listUsers')
     return proc.render()
-        except BaseException as msg:
-            logging.CyberCPLogFileWriter.writeToFile(str(msg))
-            return HttpResponse(str(msg))
-
-    except KeyError:
-        return redirect(loadLoginPage)
 
 def viewProfile(request):
-    try:
     userID = request.session['userID']
-
     admin = Administrator.objects.get(pk=userID)
 
     AdminData = {}
@@ -55,11 +46,8 @@ def viewProfile(request):
     proc = httpProc(request, 'userManagment/userProfile.html',
                     AdminData)
     return proc.render()
-    except KeyError:
-        return redirect(loadLoginPage)
 
 def createUser(request):
-    try:
     userID = request.session['userID']
     currentACL = ACLManager.loadedACL(userID)
 
@@ -81,27 +69,14 @@ def createUser(request):
     else:
         return ACLManager.loadError()
 
-    except BaseException as msg:
-        logging.CyberCPLogFileWriter.writeToFile(str(msg))
-        return redirect(loadLoginPage)
-
 def apiAccess(request):
-    try:
     userID = request.session['userID']
     currentACL = ACLManager.loadedACL(userID)
-
-        if currentACL['admin'] == 1:
     adminNames = ACLManager.loadDeletionUsers(userID, currentACL)
     adminNames.append("admin")
     proc = httpProc(request, 'userManagment/apiAccess.html',
-                            {'acctNames': adminNames})
+                    {'acctNames': adminNames}, 'admin')
     return proc.render()
-        else:
-            return ACLManager.loadError()
-
-    except BaseException as msg:
-        logging.CyberCPLogFileWriter.writeToFile(str(msg))
-        return redirect(loadLoginPage)
 
 def saveChangesAPIAccess(request):
     try:
@@ -261,14 +236,11 @@ def submitUserCreation(request):
 
 
 def modifyUsers(request):
-    try:
     userID = request.session['userID']
     userNames = ACLManager.loadAllUsers(userID)
     proc = httpProc(request, 'userManagment/modifyUser.html',
                     {"acctNames": userNames, 'securityLevels': SecurityLevel.list()})
     return proc.render()
-    except KeyError:
-        return redirect(loadLoginPage)
 
 def fetchUserDetails(request):
     try:
@@ -417,9 +389,7 @@ def saveModifications(request):
         return HttpResponse(json_data)
 
 def deleteUser(request):
-    try:
     userID = request.session['userID']
-
     currentACL = ACLManager.loadedACL(userID)
 
     if currentACL['admin'] == 1:
@@ -435,9 +405,6 @@ def deleteUser(request):
     else:
         return ACLManager.loadError()
 
-    except KeyError:
-        return redirect(loadLoginPage)
-
 def submitUserDeletion(request):
 
     try:
@@ -508,12 +475,9 @@ def submitUserDeletion(request):
         return HttpResponse(json_data)
 
 def createNewACL(request):
-    try:
     proc = httpProc(request, 'userManagment/createACL.html',
                     None, 'admin')
     return proc.render()
-    except KeyError:
-        return redirect(loadLoginPage)
 
 def createACLFunc(request):
     try:
@@ -647,7 +611,6 @@ def submitACLModifications(request):
         return HttpResponse(json_data)
 
 def changeUserACL(request):
-    try:
     userID = request.session['userID']
     currentACL = ACLManager.loadedACL(userID)
 
@@ -666,10 +629,6 @@ def changeUserACL(request):
     else:
         return ACLManager.loadError()
 
-
-    except KeyError:
-        return redirect(loadLoginPage)
-
 def changeACLFunc(request):
     try:
         val = request.session['userID']
@@ -711,7 +670,6 @@ def changeACLFunc(request):
         return HttpResponse(json_data)
 
 def resellerCenter(request):
-    try:
     userID = request.session['userID']
     currentACL = ACLManager.loadedACL(userID)
 
@@ -730,10 +688,6 @@ def resellerCenter(request):
     else:
         return ACLManager.loadError()
 
-
-    except KeyError:
-        return redirect(loadLoginPage)
-
 def saveResellerChanges(request):
     try:
         val = request.session['userID']
@@ -791,9 +745,7 @@ def saveResellerChanges(request):
         return HttpResponse(json_data)
 
 def listUsers(request):
-    try:
     userID = request.session['userID']
-
     currentACL = ACLManager.loadedACL(userID)
 
     if currentACL['admin'] == 1:
@@ -823,9 +775,6 @@ def listUsers(request):
     else:
         return ACLManager.loadError()
 
-    except KeyError:
-        return redirect(loadLoginPage)
-
 def fetchTableUsers(request):
     try:
         try: