diff --git a/CyberCP/SecurityLevel.py b/CyberCP/SecurityLevel.py new file mode 100644 index 000000000..330b778d7 --- /dev/null +++ b/CyberCP/SecurityLevel.py @@ -0,0 +1,10 @@ +from enum import Enum + + +class SecurityLevel(Enum): + HIGH = 0 + LOW = 1 + + @staticmethod + def list(): + return list(map(lambda s: s.name, SecurityLevel)) diff --git a/loginSystem/models.py b/loginSystem/models.py index b320efce8..abd302914 100755 --- a/loginSystem/models.py +++ b/loginSystem/models.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- - - from django.db import models +from CyberCP.SecurityLevel import SecurityLevel + # Create your models here. - class ACL(models.Model): name = models.CharField(unique=True,max_length = 50) adminStatus = models.IntegerField(default=0) @@ -85,7 +83,10 @@ class Administrator(models.Model): owner = models.IntegerField(default=1) token = models.CharField(max_length=500, default='None') api = models.IntegerField(default=0) - securityLevel = models.IntegerField(default=0) + securityLevel = models.IntegerField( + default=0, + choices=[(tag, tag.value) for tag in SecurityLevel] + ) state = models.CharField(max_length=10, default='ACTIVE') initWebsitesLimit = models.IntegerField(default=0) diff --git a/static/userManagment/userManagment.js b/static/userManagment/userManagment.js index d404856f8..2dfc503b2 100644 --- a/static/userManagment/userManagment.js +++ b/static/userManagment/userManagment.js @@ -188,7 +188,8 @@ app.controller('modifyUser', function ($scope, $http) { $scope.firstName = userDetails.firstName; $scope.lastName = userDetails.lastName; $scope.email = userDetails.email; - $scope.secLevel = userDetails.securityLevel; + $scope.securityLevel = userDetails.securityLevel; + $scope.currentSecurityLevel = userDetails.securityLevel; $scope.twofa = Boolean(userDetails.twofa); qrCode.set({ diff --git a/userManagment/static/userManagment/userManagment.js b/userManagment/static/userManagment/userManagment.js index d404856f8..2dfc503b2 100755 --- a/userManagment/static/userManagment/userManagment.js +++ b/userManagment/static/userManagment/userManagment.js @@ -188,7 +188,8 @@ app.controller('modifyUser', function ($scope, $http) { $scope.firstName = userDetails.firstName; $scope.lastName = userDetails.lastName; $scope.email = userDetails.email; - $scope.secLevel = userDetails.securityLevel; + $scope.securityLevel = userDetails.securityLevel; + $scope.currentSecurityLevel = userDetails.securityLevel; $scope.twofa = Boolean(userDetails.twofa); qrCode.set({ diff --git a/userManagment/templates/userManagment/createUser.html b/userManagment/templates/userManagment/createUser.html index 29a2f8465..9893fce09 100755 --- a/userManagment/templates/userManagment/createUser.html +++ b/userManagment/templates/userManagment/createUser.html @@ -106,9 +106,9 @@